diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
index d99f7a0..92c4132 100644
--- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
+++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
@@ -556,6 +556,9 @@ public class delegationServices {
                                                     BasicDBObject updateQuery6 = new BasicDBObject();
                                                     BasicDBObject updateQuery7 = new BasicDBObject();
                                                     BasicDBObject updateQuery8 = new BasicDBObject();
+                                                    //below if is used for custom greetings, and home messages, for holidays and such. (Also right before update ops)
+                                                    BasicDBObject updateQuery9 = new BasicDBObject();
+                                                    BasicDBObject updateQuery10 = new BasicDBObject();
                                                     updateQuery.append("$set",
                                                             new BasicDBObject().append("type", 8));
                                                     updateQuery1.append("$set",
@@ -574,6 +577,35 @@ public class delegationServices {
                                                             new BasicDBObject().append("status", true));
                                                     updateQuery8.append("$set",
                                                             new BasicDBObject().append("keychainUUID", keychainUUID));
+                                                    if (Filter.get("customHome").equals(true)) {
+                                                        BasicDBObject updateQuery11 = new BasicDBObject();
+                                                        updateQuery11.append("$set",
+                                                                new BasicDBObject().append("home", Filter.get("valHome")));
+                                                        updateQuery9.append("$set",
+                                                                new BasicDBObject().append("hs",true));
+                                                        dCollection.updateOne(searchQuery, updateQuery11);
+                                                        dCollection.updateOne(searchQuery, updateQuery9);
+                                                    } else {
+                                                        updateQuery9.append("$set",
+                                                                new BasicDBObject().append("hs",false));
+                                                        dCollection.updateOne(searchQuery, updateQuery9);
+                                                    }
+                                                  /*
+                                                  if (Filter.get("customGreeting").equals(true)) {
+                                                        BasicDBObject updateQuery12 = new BasicDBObject();
+                                                        updateQuery12.append("$set",
+                                                                new BasicDBObject().append("greeting", Filter.get("valGreet")));
+                                                        updateQuery10.append("$set",
+                                                                new BasicDBObject().append("gs",true));
+                                                        dCollection.updateOne(searchQuery, updateQuery12);
+                                                        dCollection.updateOne(searchQuery, updateQuery10);
+                                                    }else {
+                                                        updateQuery10.append("$set",
+                                                                new BasicDBObject().append("gs",false));
+                                                        dCollection.updateOne(searchQuery, updateQuery10);
+                                                    }
+                                                    Planned for later, current UI wont allow
+                                                   */
                                                     dCollection.updateOne(searchQuery, updateQuery);
                                                     dCollection.updateOne(searchQuery, updateQuery1);
                                                     dCollection.updateOne(searchQuery, updateQuery2);
@@ -833,6 +865,19 @@ public class delegationServices {
                                                             new BasicDBObject().append("keychainUUID", keychainUUID));
                                                     updateQuery6.append("$set",
                                                             new BasicDBObject().append("status", true));
+                                                    if (Filter.get("customHome").equals(true)) {
+                                                        BasicDBObject updateQuery11 = new BasicDBObject();
+                                                        updateQuery11.append("$set",
+                                                                new BasicDBObject().append("home", Filter.get("valHome")));
+                                                        updateQuery9.append("$set",
+                                                                new BasicDBObject().append("hs",true));
+                                                        dCollection.updateOne(searchQuery, updateQuery11);
+                                                        dCollection.updateOne(searchQuery, updateQuery9);
+                                                    } else {
+                                                        updateQuery9.append("$set",
+                                                                new BasicDBObject().append("hs",false));
+                                                        dCollection.updateOne(searchQuery, updateQuery9);
+                                                    }
                                                     System.out.println("Sending Info To Forwarding Server");
                                                     dCollection.updateOne(searchQuery, updateQuery8);
                                                     dCollection.updateOne(searchQuery, updateQuery);