diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index 1ccdd4f04e..cfee18941c 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -43,8 +43,7 @@ int hifiSockAddrMeta = qRegisterMetaType<HifiSockAddr>("HifiSockAddr");
 AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QString assignmentPool,
                                    QUuid walletUUID, QString assignmentServerHostname, quint16 assignmentServerPort,
                                    quint16 assignmentMonitorPort) :
-    _assignmentServerHostname(DEFAULT_ASSIGNMENT_SERVER_HOSTNAME),
-    _localASPortSharedMem(NULL)
+    _assignmentServerHostname(DEFAULT_ASSIGNMENT_SERVER_HOSTNAME)
 {
     LogUtils::init();
 
@@ -181,8 +180,7 @@ void AssignmentClient::sendAssignmentRequest() {
         if (_assignmentServerHostname == "localhost") {
             // we want to check again for the local domain-server port in case the DS has restarted
             quint16 localAssignmentServerPort;
-            if (nodeList->getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, _localASPortSharedMem,
-                                                             localAssignmentServerPort)) {
+            if (nodeList->getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, localAssignmentServerPort)) {
                 if (localAssignmentServerPort != _assignmentServerSocket.getPort()) {
                     qDebug() << "Port for local assignment server read from shared memory is"
                         << localAssignmentServerPort;
@@ -190,7 +188,11 @@ void AssignmentClient::sendAssignmentRequest() {
                     _assignmentServerSocket.setPort(localAssignmentServerPort);
                     nodeList->setAssignmentServerSocket(_assignmentServerSocket);
                 }
+            } else {
+                qDebug() << "Failed to read local assignment server port from shared memory"
+                    << "- will send assignment request to previous assignment server socket.";
             }
+
         }
 
         nodeList->sendAssignment(_requestAssignment);
diff --git a/assignment-client/src/AssignmentClient.h b/assignment-client/src/AssignmentClient.h
index 38d5351385..60e81a94eb 100644
--- a/assignment-client/src/AssignmentClient.h
+++ b/assignment-client/src/AssignmentClient.h
@@ -44,7 +44,6 @@ private:
     QPointer<ThreadedAssignment> _currentAssignment;
     QString _assignmentServerHostname;
     HifiSockAddr _assignmentServerSocket;
-    QSharedMemory* _localASPortSharedMem; // memory shared with domain server
     QTimer _requestTimer; // timer for requesting and assignment
     QTimer _statsTimerACM; // timer for sending stats to assignment client monitor
 
diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 60f541c10b..e02fa22246 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,531 +1,549 @@
-[
-  {
-    "name": "metaverse",
-    "label": "Metaverse / Networking",
-    "settings": [
-      {
-        "name": "access_token",
-        "label": "Access Token",
-        "help": "This is your OAuth access token to connect this domain-server with your High Fidelity account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>You can also go to the <a href='https://metaverse.highfidelity.com/user/security' target='_blank'>My Security</a> page of your account and generate a token with the 'domains' scope and paste it here.",
-        "advanced": true
-      },
-      {
-        "name": "id",
-        "label": "Domain ID",
-        "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank."
-      },
-      {
-        "name": "automatic_networking",
-        "label": "Automatic Networking",
-        "help": "This defines how other nodes in the High Fidelity metaverse will be able to reach your domain-server.<br/>If you don't want to deal with any network settings, use full automatic networking.",
-        "default": "disabled",
-        "type": "select",
-        "options": [
-          {
-            "value": "full",
-            "label": "Full: update both the IP address and port to reach my server"
-          },
-          {
-            "value": "ip",
-            "label": "IP Only: update just my IP address, I will open the port manually"
-          },
-          {
-            "value": "disabled",
-            "label": "None: use the network information I have entered for this domain at metaverse.highfidelity.com"
-          }
-        ]
-      },
-      {
-        "name": "local_port",
-        "label": "Local UDP Port",
-        "help": "This is the local port your domain-server binds to for UDP connections.<br/>Depending on your router, this may need to be changed to run multiple full automatic networking domain-servers in the same network.",
-        "default": "40102",
-        "type": "int",
-        "advanced": true
-      }
-    ]
-  },
-  {
-    "label": "Places / Paths",
-    "html_id": "places_paths",
-    "settings": [
-      {
-        "name": "paths",
-        "label": "Paths",
-        "help": "Clients can enter a path to reach an exact viewpoint in your domain.<br/>Add rows to the table below to map a path to a viewpoint.<br/>The index path ( / ) is where clients will enter if they do not enter an explicit path.",
-        "type": "table",
-        "key": {
-          "name": "path",
-          "label": "Path",
-          "placeholder": "/"
+{
+  "version": 1.0,
+  "settings": [
+    {
+      "name": "metaverse",
+      "label": "Metaverse / Networking",
+      "settings": [
+        {
+          "name": "access_token",
+          "label": "Access Token",
+          "help": "This is your OAuth access token to connect this domain-server with your High Fidelity account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>You can also go to the <a href='https://metaverse.highfidelity.com/user/security' target='_blank'>My Security</a> page of your account and generate a token with the 'domains' scope and paste it here.",
+          "advanced": true
         },
-        "columns": [
-          {
-            "name": "viewpoint",
-            "label": "Viewpoint",
-            "placeholder": "/512,512,512"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "security",
-    "label": "Security",
-    "settings": [
-      {
-        "name": "http_username",
-        "label": "HTTP Username",
-        "help": "Username used for basic HTTP authentication."
-      },
-      {
-        "name": "http_password",
-        "label": "HTTP Password",
-        "type": "password",
-        "help": "Password used for basic HTTP authentication. Leave this blank if you do not want to change it.",
-        "value-hidden": true
-      },
-      {
-        "name": "allowed_users",
-        "type": "table",
-        "label": "Allowed Users",
-        "help": "List the High Fidelity names for people you want to be able to connect to this domain.<br/>An empty list means everyone.<br/>You can always connect from the domain-server machine.",
-        "numbered": false,
-        "columns": [
-          {
-            "name": "username",
-            "label": "Username",
-            "can_set": true
-          }
-        ]
-      },
-      {
-        "name": "maximum_user_capacity",
-        "label": "Maximum User Capacity",
-        "help": "The limit on how many avatars can be connected at once.  0 means no limit.",
-        "placeholder": "0",
-        "default": "0",
-        "advanced": false
-      },
-      {
-        "name": "allowed_editors",
-        "type": "table",
-        "label": "Allowed Editors",
-        "help": "List the High Fidelity names for people you want to be able lock or unlock entities in this domain.<br/>An empty list means everyone.",
-        "numbered": false,
-        "columns": [
-          {
-            "name": "username",
-            "label": "Username",
-            "can_set": true
-          }
-        ]
-      },
-      {
-        "name": "editors_are_rezzers",
-        "type": "checkbox",
-        "label": "Only editors can create new entities",
-        "help": "When checked, only those who can edit the domain can create new entites.",
-        "default": false
-      }
-    ]
-  },
-  {
-    "name": "scripts",
-    "label": "Scripts",
-    "settings": [
-      {
-        "name": "persistent_scripts",
-        "type": "table",
-        "label": "Persistent Scripts",
-        "help": "Add the URLs for scripts that you would like to ensure are always running in your domain.",
-        "columns": [
-          {
-            "name": "url",
-            "label": "Script URL"
-          },
-          {
-            "name": "num_instances",
-            "label": "# instances",
-            "default": 1
-          },
-          {
-            "name": "pool",
-            "label": "Pool"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "audio_env",
-    "label": "Audio Environment",
-    "assignment-types": [0],
-    "settings": [
-      {
-        "name": "attenuation_per_doubling_in_distance",
-        "label": "Default Domain Attenuation",
-        "help": "Factor between 0 and 1.0 (0: No attenuation, 1.0: extreme attenuation)",
-        "placeholder": "0.18",
-        "default": "0.18",
-        "advanced": false
-      },
-      {
-        "name": "noise_muting_threshold",
-        "label": "Noise Muting Threshold",
-        "help": "Loudness value for noise background between 0 and 1.0 (0: mute everyone, 1.0: never mute)",
-        "placeholder": "0.003",
-        "default": "0.003",
-        "advanced": false
-      },
-      {
-        "name": "enable_filter",
-        "type": "checkbox",
-        "help": "positional audio stream uses lowpass filter",
-        "default": true
-      },
-      {
-        "name": "zones",
-        "type": "table",
-        "label": "Zones",
-        "help": "In this table you can define a set of zones in which you can specify various audio properties.",
-        "numbered": false,
-        "key": {
-          "name": "name",
-          "label": "Name",
-          "placeholder": "Zone_Name"
+        {
+          "name": "id",
+          "label": "Domain ID",
+          "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank."
         },
-        "columns": [
-          {
-            "name": "x_range",
-            "label": "X range",
-            "can_set": true,
-            "placeholder": "0-16384"
+        {
+          "name": "automatic_networking",
+          "label": "Automatic Networking",
+          "help": "This defines how other nodes in the High Fidelity metaverse will be able to reach your domain-server.<br/>If you don't want to deal with any network settings, use full automatic networking.",
+          "default": "disabled",
+          "type": "select",
+          "options": [
+            {
+              "value": "full",
+              "label": "Full: update both the IP address and port to reach my server"
+            },
+            {
+              "value": "ip",
+              "label": "IP Only: update just my IP address, I will open the port manually"
+            },
+            {
+              "value": "disabled",
+              "label": "None: use the network information I have entered for this domain at metaverse.highfidelity.com"
+            }
+          ]
+        },
+        {
+          "name": "local_port",
+          "label": "Local UDP Port",
+          "help": "This is the local port your domain-server binds to for UDP connections.<br/>Depending on your router, this may need to be changed to run multiple full automatic networking domain-servers in the same network.",
+          "default": "40102",
+          "type": "int",
+          "advanced": true
+        }
+      ]
+    },
+    {
+      "label": "Places / Paths",
+      "html_id": "places_paths",
+      "settings": [
+        {
+          "name": "paths",
+          "label": "Paths",
+          "help": "Clients can enter a path to reach an exact viewpoint in your domain.<br/>Add rows to the table below to map a path to a viewpoint.<br/>The index path ( / ) is where clients will enter if they do not enter an explicit path.",
+          "type": "table",
+          "key": {
+            "name": "path",
+            "label": "Path",
+            "placeholder": "/"
           },
-          {
-            "name": "y_range",
-            "label": "Y range",
-            "can_set": true,
-            "placeholder": "0-16384"
-          },
-          {
-            "name": "z_range",
-            "label": "Z range",
-            "can_set": true,
-            "placeholder": "0-16384"
-          }
-        ]
-      },
-      {
-        "name": "attenuation_coefficients",
-        "type": "table",
-        "label": "Attenuation Coefficients",
-        "help": "In this table you can set custom attenuation coefficients between audio zones",
-        "numbered": true,
-        "can_order": true,
-        "columns": [
-          {
-            "name": "source",
-            "label": "Source",
-            "can_set": true,
-            "placeholder": "Zone_A"
-          },
-          {
-            "name": "listener",
-            "label": "Listener",
-            "can_set": true,
-            "placeholder": "Zone_B"
-          },
-          {
-            "name": "coefficient",
-            "label": "Attenuation coefficient",
-            "can_set": true,
-            "placeholder": "0.18"
-          }
-        ]
-      },
-      {
-        "name": "reverb",
-        "type": "table",
-        "label": "Reverb Settings",
-        "help": "In this table you can set reverb levels for audio zones.  For a medium-sized (e.g., 100 square meter) meeting room, try a decay time of around 1.5 seconds and a wet level of -10 db. For an airplane hangar or cathedral, try a decay time of 4 seconds and a wet level of -5 db.",
-        "numbered": true,
-        "columns": [
-          {
-            "name": "zone",
-            "label": "Zone",
-            "can_set": true,
-            "placeholder": "Audio_Zone"
-          },
-          {
-            "name": "reverb_time",
-            "label": "Reverb Decay Time",
-            "can_set": true,
-            "placeholder": "(in sec)"
-          },
-          {
-            "name": "wet_level",
-            "label": "Wet Level",
-            "can_set": true,
-            "placeholder": "(in db)"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "audio_buffer",
-    "label": "Audio Buffers",
-    "assignment-types": [0],
-    "settings": [
-      {
-        "name": "dynamic_jitter_buffer",
-        "type": "checkbox",
-        "label": "Dynamic Jitter Buffers",
-        "help": "dynamically buffer client audio based on perceived jitter in packet receipt timing",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "static_desired_jitter_buffer_frames",
-        "label": "Static Desired Jitter Buffer Frames",
-        "help": "If dynamic jitter buffers is disabled, this determines the target number of frames maintained by the AudioMixer's jitter buffers",
-        "placeholder": "1",
-        "default": "1",
-        "advanced": true
-      },
-      {
-        "name": "max_frames_over_desired",
-        "label": "Max Frames Over Desired",
-        "help": "The highest number of frames an AudioMixer's ringbuffer can exceed the desired jitter buffer frames by",
-        "placeholder": "10",
-        "default": "10",
-        "advanced": true
-      },
-      {
-        "name": "use_stdev_for_desired_calc",
-        "type": "checkbox",
-        "label": "Use Stdev for Desired Jitter Frames Calc:",
-        "help": "use Philip's method (stdev of timegaps) to calculate desired jitter frames (otherwise Fred's max timegap method is used)",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "window_starve_threshold",
-        "label": "Window Starve Threshold",
-        "help": "If this many starves occur in an N-second window (N is the number in the next field), then the desired jitter frames will be re-evaluated using Window A.",
-        "placeholder": "3",
-        "default": "3",
-        "advanced": true
-      },
-      {
-        "name": "window_seconds_for_desired_calc_on_too_many_starves",
-        "label": "Timegaps Window (A) Seconds:",
-        "help": "Window A contains a history of timegaps. Its max timegap is used to re-evaluate the desired jitter frames when too many starves occur within it.",
-        "placeholder": "50",
-        "default": "50",
-        "advanced": true
-      },
-      {
-        "name": "window_seconds_for_desired_reduction",
-        "label": "Timegaps Window (B) Seconds:",
-        "help": "Window B contains a history of timegaps. Its max timegap is used as a ceiling for the desired jitter frames value.",
-        "placeholder": "10",
-        "default": "10",
-        "advanced": true
-      },
-      {
-        "name": "repetition_with_fade",
-        "type": "checkbox",
-        "label": "Repetition with Fade:",
-        "help": "dropped frames and mixing during starves repeat the last frame, eventually fading to silence",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "print_stream_stats",
-        "type": "checkbox",
-        "label": "Print Stream Stats:",
-        "help": "audio upstream and downstream stats of each agent printed to audio-mixer stdout",
-        "default": false,
-        "advanced": true
-      }
-    ]
-  },
-  {
-    "name": "entity_server_settings",
-    "label": "Entity Server Settings",
-    "assignment-types": [6],
-    "settings": [
-      {
-        "name": "persistFilename",
-        "label": "Entities Filename",
-        "help": "the path to the file entities are stored in. Make sure the path exists.",
-        "placeholder": "resources/models.svo",
-        "default": "resources/models.svo",
-        "advanced": true
-      },
-      {
-        "name": "persistAsFileType",
-        "label": "File format for entity server's persistent data",
-        "help": "This defines how the entity server will save entities to disk.",
-        "default": "svo",
-        "type": "select",
-        "options": [
-          {
-            "value": "svo",
-            "label": "Entity server persists data as SVO"
-          },
-          {
-            "value": "json",
-            "label": "Entity server persists data as JSON"
-          }
-        ],
-        "advanced": true
-      },
-      {
-        "name": "persistInterval",
-        "label": "Save Check Interval",
-        "help": "Milliseconds between checks for saving the current state of entities.",
-        "placeholder": "30000",
-        "default": "30000",
-        "advanced": true
-      },
-      {
-        "name": "backups",
-        "type": "table",
-        "label": "Backup Rules",
-        "help": "In this table you can define a set of rules for how frequently to backup copies of your entites content file.",
-        "numbered": false,
-        "default":  [
-                        {"Name":"Half Hourly Rolling","backupInterval":1800,"format":".backup.halfhourly.%N","maxBackupVersions":5},
-                        {"Name":"Daily Rolling","backupInterval":86400,"format":".backup.daily.%N","maxBackupVersions":7},
-                        {"Name":"Weekly Rolling","backupInterval":604800,"format":".backup.weekly.%N","maxBackupVersions":4},
-                        {"Name":"Thirty Day Rolling","backupInterval":2592000,"format":".backup.thirtyday.%N","maxBackupVersions":12}
-                    ],
-        "columns": [
-          {
-            "name": "Name",
+          "columns": [
+            {
+              "name": "viewpoint",
+              "label": "Viewpoint",
+              "placeholder": "/512,512,512"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "security",
+      "label": "Security",
+      "settings": [
+        {
+          "name": "http_username",
+          "label": "HTTP Username",
+          "help": "Username used for basic HTTP authentication."
+        },
+        {
+          "name": "http_password",
+          "label": "HTTP Password",
+          "type": "password",
+          "help": "Password used for basic HTTP authentication. Leave this blank if you do not want to change it.",
+          "value-hidden": true
+        },
+        {
+          "name": "restricted_access",
+          "type": "checkbox",
+          "label": "Restricted Access",
+          "default": false,
+          "help": "Only users listed in \"Allowed Users\" can enter your domain."
+        },
+        {
+          "name": "allowed_users",
+          "type": "table",
+          "label": "Allowed Users",
+          "help": "You can always connect from the domain-server machine.",
+          "numbered": false,
+          "columns": [
+            {
+              "name": "username",
+              "label": "Username",
+              "can_set": true
+            }
+          ]
+        },
+        {
+          "name": "maximum_user_capacity",
+          "label": "Maximum User Capacity",
+          "help": "The limit on how many avatars can be connected at once.  0 means no limit.",
+          "placeholder": "0",
+          "default": "0",
+          "advanced": false
+        },
+        {
+          "name": "allowed_editors",
+          "type": "table",
+          "label": "Allowed Editors",
+          "help": "List the High Fidelity names for people you want to be able lock or unlock entities in this domain.<br/>An empty list means everyone.",
+          "numbered": false,
+          "columns": [
+            {
+              "name": "username",
+              "label": "Username",
+              "can_set": true
+            }
+          ]
+        },
+        {
+          "name": "editors_are_rezzers",
+          "type": "checkbox",
+          "label": "Only Editors Can Create Entities",
+          "help": "Only users listed in \"Allowed Editors\" can create new entites.",
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "scripts",
+      "label": "Scripts",
+      "settings": [
+        {
+          "name": "persistent_scripts",
+          "type": "table",
+          "label": "Persistent Scripts",
+          "help": "Add the URLs for scripts that you would like to ensure are always running in your domain.",
+          "columns": [
+            {
+              "name": "url",
+              "label": "Script URL"
+            },
+            {
+              "name": "num_instances",
+              "label": "# instances",
+              "default": 1
+            },
+            {
+              "name": "pool",
+              "label": "Pool"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "audio_env",
+      "label": "Audio Environment",
+      "assignment-types": [0],
+      "settings": [
+        {
+          "name": "attenuation_per_doubling_in_distance",
+          "label": "Default Domain Attenuation",
+          "help": "Factor between 0 and 1.0 (0: No attenuation, 1.0: extreme attenuation)",
+          "placeholder": "0.18",
+          "default": "0.18",
+          "advanced": false
+        },
+        {
+          "name": "noise_muting_threshold",
+          "label": "Noise Muting Threshold",
+          "help": "Loudness value for noise background between 0 and 1.0 (0: mute everyone, 1.0: never mute)",
+          "placeholder": "0.003",
+          "default": "0.003",
+          "advanced": false
+        },
+        {
+          "name": "enable_filter",
+          "label": "Low-pass Filter",
+          "type": "checkbox",
+          "help": "Positional audio stream uses low-pass filter",
+          "default": true
+        },
+        {
+          "name": "zones",
+          "type": "table",
+          "label": "Zones",
+          "help": "In this table you can define a set of zones in which you can specify various audio properties.",
+          "numbered": false,
+          "key": {
+            "name": "name",
             "label": "Name",
-            "can_set": true,
-            "placeholder": "Example",
-            "default": "Example"
+            "placeholder": "Zone_Name"
           },
-          {
-            "name": "format",
-            "label": "Rule Format",
-            "can_set": true,
-            "help": "Format used to create the extension for the backup of your persisted entities. Use a format with %N to get rolling. Or use date formatting like %Y-%m-%d.%H:%M:%S.%z",
-            "placeholder": ".backup.example.%N",
-            "default": ".backup.example.%N"
-          },
-          {
-            "name": "backupInterval",
-            "label": "Backup Interval in Seconds",
-            "help": "Interval between backup checks in seconds.",
-            "placeholder": 1800,
-            "default": 1800,
-            "can_set": true
-          },
-          {
-            "name": "maxBackupVersions",
-            "label": "Max Rolled Backup Versions",
-            "help": "If your backup extension format uses 'rolling', how many versions do you want us to keep?",
-            "placeholder": 5,
-            "default": 5,
-            "can_set": true
-          }
-        ]
-      },
-      {
-        "name": "NoPersist",
-        "type": "checkbox",
-        "help": "Don't persist your entities to a file.",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "NoBackup",
-        "type": "checkbox",
-        "help": "Don't regularly backup your persisted entities to a backup file.",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "statusHost",
-        "label": "Status Hostname",
-        "help": "host name or IP address of the server for accessing the status page",
-        "placeholder": "",
-        "default": "",
-        "advanced": true
-      },
-      {
-        "name": "statusPort",
-        "label": "Status Port",
-        "help": "port of the server for accessing the status page",
-        "placeholder": "",
-        "default": "",
-        "advanced": true
-      },
-      {
-        "name": "wantEditLogging",
-        "type": "checkbox",
-        "help": "Logging of all edits to entities",
-        "default": true,
-        "advanced": true
-      },
-      {
-        "name": "verboseDebug",
-        "type": "checkbox",
-        "help": "lots of debugging",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "debugReceiving",
-        "type": "checkbox",
-        "help": "extra debugging on receiving",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "debugSending",
-        "type": "checkbox",
-        "help": "extra debugging on sending",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "debugTimestampNow",
-        "type": "checkbox",
-        "help": "extra debugging for usecTimestampNow() function",
-        "default": false,
-        "advanced": true
-      },
-      {
-        "name": "clockSkew",
-        "label": "Clock Skew",
-        "help": "Number of msecs to skew the server clock by to test clock skew",
-        "placeholder": "0",
-        "default": "0",
-        "advanced": true
-      }
-    ]
-  },
-  {
-    "name": "avatar_mixer",
-    "label": "Avatar Mixer",
-    "assignment-types": [1],
-    "settings": [
-      {
-        "name": "max_node_send_bandwidth",
-        "type": "double",
-        "label": "Per-Node Bandwidth",
-        "help": "Desired maximum send bandwidth (in Megabits per second) to each node",
-        "placeholder": 1.0,
-        "default": 1.0,
-        "advanced": true
-      }
-    ]
-  }
-]
+          "columns": [
+            {
+              "name": "x_range",
+              "label": "X range",
+              "can_set": true,
+              "placeholder": "0-16384"
+            },
+            {
+              "name": "y_range",
+              "label": "Y range",
+              "can_set": true,
+              "placeholder": "0-16384"
+            },
+            {
+              "name": "z_range",
+              "label": "Z range",
+              "can_set": true,
+              "placeholder": "0-16384"
+            }
+          ]
+        },
+        {
+          "name": "attenuation_coefficients",
+          "type": "table",
+          "label": "Attenuation Coefficients",
+          "help": "In this table you can set custom attenuation coefficients between audio zones",
+          "numbered": true,
+          "can_order": true,
+          "columns": [
+            {
+              "name": "source",
+              "label": "Source",
+              "can_set": true,
+              "placeholder": "Zone_A"
+            },
+            {
+              "name": "listener",
+              "label": "Listener",
+              "can_set": true,
+              "placeholder": "Zone_B"
+            },
+            {
+              "name": "coefficient",
+              "label": "Attenuation coefficient",
+              "can_set": true,
+              "placeholder": "0.18"
+            }
+          ]
+        },
+        {
+          "name": "reverb",
+          "type": "table",
+          "label": "Reverb Settings",
+          "help": "In this table you can set reverb levels for audio zones.  For a medium-sized (e.g., 100 square meter) meeting room, try a decay time of around 1.5 seconds and a wet level of -10 db. For an airplane hangar or cathedral, try a decay time of 4 seconds and a wet level of -5 db.",
+          "numbered": true,
+          "columns": [
+            {
+              "name": "zone",
+              "label": "Zone",
+              "can_set": true,
+              "placeholder": "Audio_Zone"
+            },
+            {
+              "name": "reverb_time",
+              "label": "Reverb Decay Time",
+              "can_set": true,
+              "placeholder": "(in sec)"
+            },
+            {
+              "name": "wet_level",
+              "label": "Wet Level",
+              "can_set": true,
+              "placeholder": "(in db)"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "audio_buffer",
+      "label": "Audio Buffers",
+      "assignment-types": [0],
+      "settings": [
+        {
+          "name": "dynamic_jitter_buffer",
+          "type": "checkbox",
+          "label": "Dynamic Jitter Buffers",
+          "help": "Dynamically buffer client audio based on perceived jitter in packet receipt timing",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "static_desired_jitter_buffer_frames",
+          "label": "Static Desired Jitter Buffer Frames",
+          "help": "If dynamic jitter buffers is disabled, this determines the target number of frames maintained by the AudioMixer's jitter buffers",
+          "placeholder": "1",
+          "default": "1",
+          "advanced": true
+        },
+        {
+          "name": "max_frames_over_desired",
+          "label": "Max Frames Over Desired",
+          "help": "The highest number of frames an AudioMixer's ringbuffer can exceed the desired jitter buffer frames by",
+          "placeholder": "10",
+          "default": "10",
+          "advanced": true
+        },
+        {
+          "name": "use_stdev_for_desired_calc",
+          "type": "checkbox",
+          "label": "Stdev for Desired Jitter Frames Calc",
+          "help": "Use Philip's method (stdev of timegaps) to calculate desired jitter frames (otherwise Fred's max timegap method is used)",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "window_starve_threshold",
+          "label": "Window Starve Threshold",
+          "help": "If this many starves occur in an N-second window (N is the number in the next field), then the desired jitter frames will be re-evaluated using Window A.",
+          "placeholder": "3",
+          "default": "3",
+          "advanced": true
+        },
+        {
+          "name": "window_seconds_for_desired_calc_on_too_many_starves",
+          "label": "Timegaps Window (A) Seconds",
+          "help": "Window A contains a history of timegaps. Its max timegap is used to re-evaluate the desired jitter frames when too many starves occur within it.",
+          "placeholder": "50",
+          "default": "50",
+          "advanced": true
+        },
+        {
+          "name": "window_seconds_for_desired_reduction",
+          "label": "Timegaps Window (B) Seconds",
+          "help": "Window B contains a history of timegaps. Its max timegap is used as a ceiling for the desired jitter frames value.",
+          "placeholder": "10",
+          "default": "10",
+          "advanced": true
+        },
+        {
+          "name": "repetition_with_fade",
+          "type": "checkbox",
+          "label": "Repetition with Fade",
+          "help": "Dropped frames and mixing during starves repeat the last frame, eventually fading to silence",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "print_stream_stats",
+          "type": "checkbox",
+          "label": "Print Stream Stats",
+          "help": "Audio upstream and downstream stats of each agent printed to audio-mixer stdout",
+          "default": false,
+          "advanced": true
+        }
+      ]
+    },
+    {
+      "name": "entity_server_settings",
+      "label": "Entity Server Settings",
+      "assignment-types": [6],
+      "settings": [
+        {
+          "name": "persistFilename",
+          "label": "Entities Filename",
+          "help": "the path to the file entities are stored in. Make sure the path exists.",
+          "placeholder": "resources/models.svo",
+          "default": "resources/models.svo",
+          "advanced": true
+        },
+        {
+          "name": "persistAsFileType",
+          "label": "File format for entity server's persistent data",
+          "help": "This defines how the entity server will save entities to disk.",
+          "default": "svo",
+          "type": "select",
+          "options": [
+            {
+              "value": "svo",
+              "label": "Entity server persists data as SVO"
+            },
+            {
+              "value": "json",
+              "label": "Entity server persists data as JSON"
+            }
+          ],
+          "advanced": true
+        },
+        {
+          "name": "persistInterval",
+          "label": "Save Check Interval",
+          "help": "Milliseconds between checks for saving the current state of entities.",
+          "placeholder": "30000",
+          "default": "30000",
+          "advanced": true
+        },
+        {
+          "name": "backups",
+          "type": "table",
+          "label": "Backup Rules",
+          "help": "In this table you can define a set of rules for how frequently to backup copies of your entites content file.",
+          "numbered": false,
+          "default":  [
+                          {"Name":"Half Hourly Rolling","backupInterval":1800,"format":".backup.halfhourly.%N","maxBackupVersions":5},
+                          {"Name":"Daily Rolling","backupInterval":86400,"format":".backup.daily.%N","maxBackupVersions":7},
+                          {"Name":"Weekly Rolling","backupInterval":604800,"format":".backup.weekly.%N","maxBackupVersions":4},
+                          {"Name":"Thirty Day Rolling","backupInterval":2592000,"format":".backup.thirtyday.%N","maxBackupVersions":12}
+                      ],
+          "columns": [
+            {
+              "name": "Name",
+              "label": "Name",
+              "can_set": true,
+              "placeholder": "Example",
+              "default": "Example"
+            },
+            {
+              "name": "format",
+              "label": "Rule Format",
+              "can_set": true,
+              "help": "Format used to create the extension for the backup of your persisted entities. Use a format with %N to get rolling. Or use date formatting like %Y-%m-%d.%H:%M:%S.%z",
+              "placeholder": ".backup.example.%N",
+              "default": ".backup.example.%N"
+            },
+            {
+              "name": "backupInterval",
+              "label": "Backup Interval in Seconds",
+              "help": "Interval between backup checks in seconds.",
+              "placeholder": 1800,
+              "default": 1800,
+              "can_set": true
+            },
+            {
+              "name": "maxBackupVersions",
+              "label": "Max Rolled Backup Versions",
+              "help": "If your backup extension format uses 'rolling', how many versions do you want us to keep?",
+              "placeholder": 5,
+              "default": 5,
+              "can_set": true
+            }
+          ]
+        },
+        {
+          "name": "NoPersist",
+          "type": "checkbox",
+          "label": "Disable Persistence",
+          "help": "Don't persist your entities to a file.",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "NoBackup",
+          "type": "checkbox",
+          "label": "Disable Backup",
+          "help": "Don't regularly backup your persisted entities to a backup file.",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "statusHost",
+          "label": "Status Hostname",
+          "help": "Host name or IP address of the server for accessing the status page",
+          "placeholder": "",
+          "default": "",
+          "advanced": true
+        },
+        {
+          "name": "statusPort",
+          "label": "Status Port",
+          "help": "Port of the server for accessing the status page",
+          "placeholder": "",
+          "default": "",
+          "advanced": true
+        },
+        {
+          "name": "wantEditLogging",
+          "type": "checkbox",
+          "label": "Edit Logging",
+          "help": "Logging of all edits to entities",
+          "default": true,
+          "advanced": true
+        },
+        {
+          "name": "verboseDebug",
+          "type": "checkbox",
+          "label": "Verbose Debug",
+          "help": "Lots of debugging",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "debugReceiving",
+          "type": "checkbox",
+          "label": "Extra Receiving Debug",
+          "help": "Extra debugging on receiving",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "debugSending",
+          "type": "checkbox",
+          "label": "Extra Sending Debug",
+          "help": "Extra debugging on sending",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "debugTimestampNow",
+          "type": "checkbox",
+          "label": "Extra Timestamp Debugging",
+          "help": "Extra debugging for usecTimestampNow() function",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "clockSkew",
+          "label": "Clock Skew",
+          "help": "Number of msecs to skew the server clock by to test clock skew",
+          "placeholder": "0",
+          "default": "0",
+          "advanced": true
+        }
+      ]
+    },
+    {
+      "name": "avatar_mixer",
+      "label": "Avatar Mixer",
+      "assignment-types": [1],
+      "settings": [
+        {
+          "name": "max_node_send_bandwidth",
+          "type": "double",
+          "label": "Per-Node Bandwidth",
+          "help": "Desired maximum send bandwidth (in Megabits per second) to each node",
+          "placeholder": 1.0,
+          "default": 1.0,
+          "advanced": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/domain-server/resources/web/css/bootstrap-switch.min.css b/domain-server/resources/web/css/bootstrap-switch.min.css
new file mode 100755
index 0000000000..6eb3d4d9e3
--- /dev/null
+++ b/domain-server/resources/web/css/bootstrap-switch.min.css
@@ -0,0 +1,22 @@
+/* ========================================================================
+ * bootstrap-switch - v3.3.2
+ * http://www.bootstrap-switch.org
+ * ========================================================================
+ * Copyright 2012-2013 Mattia Larentis
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
+.bootstrap-switch{display:inline-block;direction:ltr;cursor:pointer;border-radius:4px;border:1px solid;border-color:#ccc;position:relative;text-align:left;overflow:hidden;line-height:8px;z-index:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.bootstrap-switch .bootstrap-switch-container{display:inline-block;top:0;border-radius:4px;-webkit-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0)}.bootstrap-switch .bootstrap-switch-handle-on,.bootstrap-switch .bootstrap-switch-handle-off,.bootstrap-switch .bootstrap-switch-label{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;cursor:pointer;display:inline-block !important;height:100%;padding:6px 12px;font-size:14px;line-height:20px}.bootstrap-switch .bootstrap-switch-handle-on,.bootstrap-switch .bootstrap-switch-handle-off{text-align:center;z-index:1}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary{color:#fff;background:#428bca}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info{color:#fff;background:#5bc0de}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success{color:#fff;background:#5cb85c}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning{background:#f0ad4e;color:#fff}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger{color:#fff;background:#d9534f}.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default,.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default{color:#000;background:#eee}.bootstrap-switch .bootstrap-switch-label{text-align:center;margin-top:-1px;margin-bottom:-1px;z-index:100;color:#333;background:#fff}.bootstrap-switch .bootstrap-switch-handle-on{border-bottom-left-radius:3px;border-top-left-radius:3px}.bootstrap-switch .bootstrap-switch-handle-off{border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch input[type='radio'],.bootstrap-switch input[type='checkbox']{position:absolute !important;top:0;left:0;opacity:0;filter:alpha(opacity=0);z-index:-1}.bootstrap-switch input[type='radio'].form-control,.bootstrap-switch input[type='checkbox'].form-control{height:auto}.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-label{padding:1px 5px;font-size:12px;line-height:1.5}.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-label{padding:5px 10px;font-size:12px;line-height:1.5}.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-label{padding:6px 16px;font-size:18px;line-height:1.33}.bootstrap-switch.bootstrap-switch-disabled,.bootstrap-switch.bootstrap-switch-readonly,.bootstrap-switch.bootstrap-switch-indeterminate{cursor:default !important}.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-on,.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-off,.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-label{opacity:.5;filter:alpha(opacity=50);cursor:default !important}.bootstrap-switch.bootstrap-switch-animate .bootstrap-switch-container{-webkit-transition:margin-left .5s;transition:margin-left .5s}.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-on{border-bottom-left-radius:0;border-top-left-radius:0;border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-off{border-bottom-right-radius:0;border-top-right-radius:0;border-bottom-left-radius:3px;border-top-left-radius:3px}.bootstrap-switch.bootstrap-switch-focused{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.bootstrap-switch.bootstrap-switch-on .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-off .bootstrap-switch-label{border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch.bootstrap-switch-off .bootstrap-switch-label,.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-on .bootstrap-switch-label{border-bottom-left-radius:3px;border-top-left-radius:3px}
\ No newline at end of file
diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 952a504b13..1ed2594c11 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -109,6 +109,13 @@ table {
   width: 100%;
 }
 
+/* styling for bootstrap-switch toggles */
+.checkbox-help {
+  margin-top: 10px;
+}
+
+/* CSS only spinner for AJAX requests */
+
 .spinner {
   margin: 30px auto 0;
   width: 70px;
diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html
index 4a75279e8f..f3cacf4b21 100644
--- a/domain-server/resources/web/header.html
+++ b/domain-server/resources/web/header.html
@@ -7,7 +7,9 @@
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/style.css" rel="stylesheet" media="screen">
     <link href="/css/sweetalert.css" rel="stylesheet" media="screen">
+    <link href="/css/bootstrap-switch.min.css" rel="stylesheet" media="screen">
     <link href="/stats/css/json.human.css" rel="stylesheet" media="screen">
+
   </head>
   <body>
     <nav class="navbar navbar-default" role="navigation">
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index 957ff2192f..35eab080b9 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -99,7 +99,8 @@
 <script src='/js/underscore-min.js'></script>
 <script src='/js/underscore-keypath.min.js'></script>
 <script src='/js/bootbox.min.js'></script>
-<script src='/js/sweetalert.min.js'></script>
-<script src='/js/settings.js'></script>
-<script src='/js/form2js.min.js'></script>
+<script src='js/bootstrap-switch.min.js'></script>
+<script src='js/sweetalert.min.js'></script>
+<script src='js/settings.js'></script>
+<script src='js/form2js.min.js'></script>
 <!--#include virtual="page-end.html"-->
diff --git a/domain-server/resources/web/settings/js/bootstrap-switch.min.js b/domain-server/resources/web/settings/js/bootstrap-switch.min.js
new file mode 100755
index 0000000000..232ed13908
--- /dev/null
+++ b/domain-server/resources/web/settings/js/bootstrap-switch.min.js
@@ -0,0 +1,22 @@
+/* ========================================================================
+ * bootstrap-switch - v3.3.2
+ * http://www.bootstrap-switch.org
+ * ========================================================================
+ * Copyright 2012-2013 Mattia Larentis
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
+(function(){var t=[].slice;!function(e,i){"use strict";var n;return n=function(){function t(t,i){null==i&&(i={}),this.$element=e(t),this.options=e.extend({},e.fn.bootstrapSwitch.defaults,{state:this.$element.is(":checked"),size:this.$element.data("size"),animate:this.$element.data("animate"),disabled:this.$element.is(":disabled"),readonly:this.$element.is("[readonly]"),indeterminate:this.$element.data("indeterminate"),inverse:this.$element.data("inverse"),radioAllOff:this.$element.data("radio-all-off"),onColor:this.$element.data("on-color"),offColor:this.$element.data("off-color"),onText:this.$element.data("on-text"),offText:this.$element.data("off-text"),labelText:this.$element.data("label-text"),handleWidth:this.$element.data("handle-width"),labelWidth:this.$element.data("label-width"),baseClass:this.$element.data("base-class"),wrapperClass:this.$element.data("wrapper-class")},i),this.$wrapper=e("<div>",{"class":function(t){return function(){var e;return e=[""+t.options.baseClass].concat(t._getClasses(t.options.wrapperClass)),e.push(t.options.state?""+t.options.baseClass+"-on":""+t.options.baseClass+"-off"),null!=t.options.size&&e.push(""+t.options.baseClass+"-"+t.options.size),t.options.disabled&&e.push(""+t.options.baseClass+"-disabled"),t.options.readonly&&e.push(""+t.options.baseClass+"-readonly"),t.options.indeterminate&&e.push(""+t.options.baseClass+"-indeterminate"),t.options.inverse&&e.push(""+t.options.baseClass+"-inverse"),t.$element.attr("id")&&e.push(""+t.options.baseClass+"-id-"+t.$element.attr("id")),e.join(" ")}}(this)()}),this.$container=e("<div>",{"class":""+this.options.baseClass+"-container"}),this.$on=e("<span>",{html:this.options.onText,"class":""+this.options.baseClass+"-handle-on "+this.options.baseClass+"-"+this.options.onColor}),this.$off=e("<span>",{html:this.options.offText,"class":""+this.options.baseClass+"-handle-off "+this.options.baseClass+"-"+this.options.offColor}),this.$label=e("<span>",{html:this.options.labelText,"class":""+this.options.baseClass+"-label"}),this.$element.on("init.bootstrapSwitch",function(e){return function(){return e.options.onInit.apply(t,arguments)}}(this)),this.$element.on("switchChange.bootstrapSwitch",function(e){return function(){return e.options.onSwitchChange.apply(t,arguments)}}(this)),this.$container=this.$element.wrap(this.$container).parent(),this.$wrapper=this.$container.wrap(this.$wrapper).parent(),this.$element.before(this.options.inverse?this.$off:this.$on).before(this.$label).before(this.options.inverse?this.$on:this.$off),this.options.indeterminate&&this.$element.prop("indeterminate",!0),this._init(),this._elementHandlers(),this._handleHandlers(),this._labelHandlers(),this._formHandler(),this._externalLabelHandler(),this.$element.trigger("init.bootstrapSwitch")}return t.prototype._constructor=t,t.prototype.state=function(t,e){return"undefined"==typeof t?this.options.state:this.options.disabled||this.options.readonly?this.$element:this.options.state&&!this.options.radioAllOff&&this.$element.is(":radio")?this.$element:(this.options.indeterminate&&this.indeterminate(!1),t=!!t,this.$element.prop("checked",t).trigger("change.bootstrapSwitch",e),this.$element)},t.prototype.toggleState=function(t){return this.options.disabled||this.options.readonly?this.$element:this.options.indeterminate?(this.indeterminate(!1),this.state(!0)):this.$element.prop("checked",!this.options.state).trigger("change.bootstrapSwitch",t)},t.prototype.size=function(t){return"undefined"==typeof t?this.options.size:(null!=this.options.size&&this.$wrapper.removeClass(""+this.options.baseClass+"-"+this.options.size),t&&this.$wrapper.addClass(""+this.options.baseClass+"-"+t),this._width(),this._containerPosition(),this.options.size=t,this.$element)},t.prototype.animate=function(t){return"undefined"==typeof t?this.options.animate:(t=!!t,t===this.options.animate?this.$element:this.toggleAnimate())},t.prototype.toggleAnimate=function(){return this.options.animate=!this.options.animate,this.$wrapper.toggleClass(""+this.options.baseClass+"-animate"),this.$element},t.prototype.disabled=function(t){return"undefined"==typeof t?this.options.disabled:(t=!!t,t===this.options.disabled?this.$element:this.toggleDisabled())},t.prototype.toggleDisabled=function(){return this.options.disabled=!this.options.disabled,this.$element.prop("disabled",this.options.disabled),this.$wrapper.toggleClass(""+this.options.baseClass+"-disabled"),this.$element},t.prototype.readonly=function(t){return"undefined"==typeof t?this.options.readonly:(t=!!t,t===this.options.readonly?this.$element:this.toggleReadonly())},t.prototype.toggleReadonly=function(){return this.options.readonly=!this.options.readonly,this.$element.prop("readonly",this.options.readonly),this.$wrapper.toggleClass(""+this.options.baseClass+"-readonly"),this.$element},t.prototype.indeterminate=function(t){return"undefined"==typeof t?this.options.indeterminate:(t=!!t,t===this.options.indeterminate?this.$element:this.toggleIndeterminate())},t.prototype.toggleIndeterminate=function(){return this.options.indeterminate=!this.options.indeterminate,this.$element.prop("indeterminate",this.options.indeterminate),this.$wrapper.toggleClass(""+this.options.baseClass+"-indeterminate"),this._containerPosition(),this.$element},t.prototype.inverse=function(t){return"undefined"==typeof t?this.options.inverse:(t=!!t,t===this.options.inverse?this.$element:this.toggleInverse())},t.prototype.toggleInverse=function(){var t,e;return this.$wrapper.toggleClass(""+this.options.baseClass+"-inverse"),e=this.$on.clone(!0),t=this.$off.clone(!0),this.$on.replaceWith(t),this.$off.replaceWith(e),this.$on=t,this.$off=e,this.options.inverse=!this.options.inverse,this.$element},t.prototype.onColor=function(t){var e;return e=this.options.onColor,"undefined"==typeof t?e:(null!=e&&this.$on.removeClass(""+this.options.baseClass+"-"+e),this.$on.addClass(""+this.options.baseClass+"-"+t),this.options.onColor=t,this.$element)},t.prototype.offColor=function(t){var e;return e=this.options.offColor,"undefined"==typeof t?e:(null!=e&&this.$off.removeClass(""+this.options.baseClass+"-"+e),this.$off.addClass(""+this.options.baseClass+"-"+t),this.options.offColor=t,this.$element)},t.prototype.onText=function(t){return"undefined"==typeof t?this.options.onText:(this.$on.html(t),this._width(),this._containerPosition(),this.options.onText=t,this.$element)},t.prototype.offText=function(t){return"undefined"==typeof t?this.options.offText:(this.$off.html(t),this._width(),this._containerPosition(),this.options.offText=t,this.$element)},t.prototype.labelText=function(t){return"undefined"==typeof t?this.options.labelText:(this.$label.html(t),this._width(),this.options.labelText=t,this.$element)},t.prototype.handleWidth=function(t){return"undefined"==typeof t?this.options.handleWidth:(this.options.handleWidth=t,this._width(),this._containerPosition(),this.$element)},t.prototype.labelWidth=function(t){return"undefined"==typeof t?this.options.labelWidth:(this.options.labelWidth=t,this._width(),this._containerPosition(),this.$element)},t.prototype.baseClass=function(){return this.options.baseClass},t.prototype.wrapperClass=function(t){return"undefined"==typeof t?this.options.wrapperClass:(t||(t=e.fn.bootstrapSwitch.defaults.wrapperClass),this.$wrapper.removeClass(this._getClasses(this.options.wrapperClass).join(" ")),this.$wrapper.addClass(this._getClasses(t).join(" ")),this.options.wrapperClass=t,this.$element)},t.prototype.radioAllOff=function(t){return"undefined"==typeof t?this.options.radioAllOff:(t=!!t,t===this.options.radioAllOff?this.$element:(this.options.radioAllOff=t,this.$element))},t.prototype.onInit=function(t){return"undefined"==typeof t?this.options.onInit:(t||(t=e.fn.bootstrapSwitch.defaults.onInit),this.options.onInit=t,this.$element)},t.prototype.onSwitchChange=function(t){return"undefined"==typeof t?this.options.onSwitchChange:(t||(t=e.fn.bootstrapSwitch.defaults.onSwitchChange),this.options.onSwitchChange=t,this.$element)},t.prototype.destroy=function(){var t;return t=this.$element.closest("form"),t.length&&t.off("reset.bootstrapSwitch").removeData("bootstrap-switch"),this.$container.children().not(this.$element).remove(),this.$element.unwrap().unwrap().off(".bootstrapSwitch").removeData("bootstrap-switch"),this.$element},t.prototype._width=function(){var t,e;return t=this.$on.add(this.$off),t.add(this.$label).css("width",""),e="auto"===this.options.handleWidth?Math.max(this.$on.width(),this.$off.width()):this.options.handleWidth,t.width(e),this.$label.width(function(t){return function(i,n){return"auto"!==t.options.labelWidth?t.options.labelWidth:e>n?e:n}}(this)),this._handleWidth=this.$on.outerWidth(),this._labelWidth=this.$label.outerWidth(),this.$container.width(2*this._handleWidth+this._labelWidth),this.$wrapper.width(this._handleWidth+this._labelWidth)},t.prototype._containerPosition=function(t,e){return null==t&&(t=this.options.state),this.$container.css("margin-left",function(e){return function(){var i;return i=[0,"-"+e._handleWidth+"px"],e.options.indeterminate?"-"+e._handleWidth/2+"px":t?e.options.inverse?i[1]:i[0]:e.options.inverse?i[0]:i[1]}}(this)),e?setTimeout(function(){return e()},50):void 0},t.prototype._init=function(){var t,e;return t=function(t){return function(){return t._width(),t._containerPosition(null,function(){return t.options.animate?t.$wrapper.addClass(""+t.options.baseClass+"-animate"):void 0})}}(this),this.$wrapper.is(":visible")?t():e=i.setInterval(function(n){return function(){return n.$wrapper.is(":visible")?(t(),i.clearInterval(e)):void 0}}(this),50)},t.prototype._elementHandlers=function(){return this.$element.on({"change.bootstrapSwitch":function(t){return function(i,n){var o;return i.preventDefault(),i.stopImmediatePropagation(),o=t.$element.is(":checked"),t._containerPosition(o),o!==t.options.state?(t.options.state=o,t.$wrapper.toggleClass(""+t.options.baseClass+"-off").toggleClass(""+t.options.baseClass+"-on"),n?void 0:(t.$element.is(":radio")&&e("[name='"+t.$element.attr("name")+"']").not(t.$element).prop("checked",!1).trigger("change.bootstrapSwitch",!0),t.$element.trigger("switchChange.bootstrapSwitch",[o]))):void 0}}(this),"focus.bootstrapSwitch":function(t){return function(e){return e.preventDefault(),t.$wrapper.addClass(""+t.options.baseClass+"-focused")}}(this),"blur.bootstrapSwitch":function(t){return function(e){return e.preventDefault(),t.$wrapper.removeClass(""+t.options.baseClass+"-focused")}}(this),"keydown.bootstrapSwitch":function(t){return function(e){if(e.which&&!t.options.disabled&&!t.options.readonly)switch(e.which){case 37:return e.preventDefault(),e.stopImmediatePropagation(),t.state(!1);case 39:return e.preventDefault(),e.stopImmediatePropagation(),t.state(!0)}}}(this)})},t.prototype._handleHandlers=function(){return this.$on.on("click.bootstrapSwitch",function(t){return function(e){return e.preventDefault(),e.stopPropagation(),t.state(!1),t.$element.trigger("focus.bootstrapSwitch")}}(this)),this.$off.on("click.bootstrapSwitch",function(t){return function(e){return e.preventDefault(),e.stopPropagation(),t.state(!0),t.$element.trigger("focus.bootstrapSwitch")}}(this))},t.prototype._labelHandlers=function(){return this.$label.on({"mousedown.bootstrapSwitch touchstart.bootstrapSwitch":function(t){return function(e){return t._dragStart||t.options.disabled||t.options.readonly?void 0:(e.preventDefault(),e.stopPropagation(),t._dragStart=(e.pageX||e.originalEvent.touches[0].pageX)-parseInt(t.$container.css("margin-left"),10),t.options.animate&&t.$wrapper.removeClass(""+t.options.baseClass+"-animate"),t.$element.trigger("focus.bootstrapSwitch"))}}(this),"mousemove.bootstrapSwitch touchmove.bootstrapSwitch":function(t){return function(e){var i;if(null!=t._dragStart&&(e.preventDefault(),i=(e.pageX||e.originalEvent.touches[0].pageX)-t._dragStart,!(i<-t._handleWidth||i>0)))return t._dragEnd=i,t.$container.css("margin-left",""+t._dragEnd+"px")}}(this),"mouseup.bootstrapSwitch touchend.bootstrapSwitch":function(t){return function(e){var i;if(t._dragStart)return e.preventDefault(),t.options.animate&&t.$wrapper.addClass(""+t.options.baseClass+"-animate"),t._dragEnd?(i=t._dragEnd>-(t._handleWidth/2),t._dragEnd=!1,t.state(t.options.inverse?!i:i)):t.state(!t.options.state),t._dragStart=!1}}(this),"mouseleave.bootstrapSwitch":function(t){return function(){return t.$label.trigger("mouseup.bootstrapSwitch")}}(this)})},t.prototype._externalLabelHandler=function(){var t;return t=this.$element.closest("label"),t.on("click",function(e){return function(i){return i.preventDefault(),i.stopImmediatePropagation(),i.target===t[0]?e.toggleState():void 0}}(this))},t.prototype._formHandler=function(){var t;return t=this.$element.closest("form"),t.data("bootstrap-switch")?void 0:t.on("reset.bootstrapSwitch",function(){return i.setTimeout(function(){return t.find("input").filter(function(){return e(this).data("bootstrap-switch")}).each(function(){return e(this).bootstrapSwitch("state",this.checked)})},1)}).data("bootstrap-switch",!0)},t.prototype._getClasses=function(t){var i,n,o,s;if(!e.isArray(t))return[""+this.options.baseClass+"-"+t];for(n=[],o=0,s=t.length;s>o;o++)i=t[o],n.push(""+this.options.baseClass+"-"+i);return n},t}(),e.fn.bootstrapSwitch=function(){var i,o,s;return o=arguments[0],i=2<=arguments.length?t.call(arguments,1):[],s=this,this.each(function(){var t,a;return t=e(this),a=t.data("bootstrap-switch"),a||t.data("bootstrap-switch",a=new n(this,o)),"string"==typeof o?s=a[o].apply(a,i):void 0}),s},e.fn.bootstrapSwitch.Constructor=n,e.fn.bootstrapSwitch.defaults={state:!0,size:null,animate:!0,disabled:!1,readonly:!1,indeterminate:!1,inverse:!1,radioAllOff:!1,onColor:"primary",offColor:"default",onText:"ON",offText:"OFF",labelText:"&nbsp;",handleWidth:"auto",labelWidth:"auto",baseClass:"bootstrap-switch",wrapperClass:"wrapper",onInit:function(){},onSwitchChange:function(){}}}(window.jQuery,window)}).call(this);
\ No newline at end of file
diff --git a/domain-server/resources/web/js/form2js.min.js b/domain-server/resources/web/settings/js/form2js.min.js
similarity index 100%
rename from domain-server/resources/web/js/form2js.min.js
rename to domain-server/resources/web/settings/js/form2js.min.js
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/settings/js/settings.js
similarity index 97%
rename from domain-server/resources/web/js/settings.js
rename to domain-server/resources/web/settings/js/settings.js
index 044f846293..450d686cd4 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -60,10 +60,15 @@ var viewHelpers = {
       if (setting.label) {
         form_group += "<label class='" + label_class + "'>" + setting.label + "</label>"
       }
-      form_group += "<div class='checkbox" + (isLocked ? " disabled" : "") + "'>"
-      form_group += "<label for='" + keypath + "'>"
-      form_group += "<input type='checkbox'" + common_attrs() + (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
-      form_group += " " + setting.help + "</label>";
+
+      form_group += "<div class='toggle-checkbox-container" + (isLocked ? " disabled" : "") + "'>"
+      form_group += "<input type='checkbox'" + common_attrs('toggle-checkbox') + (setting_value ? "checked" : "")
+      form_group += (isLocked ? " disabled" : "") + "/>"
+
+      if (setting.help) {
+        form_group += "<span class='help-block checkbox-help'>" + setting.help + "</span>";
+      }
+
       form_group += "</div>"
     } else {
       input_type = _.has(setting, 'type') ? setting.type : "text"
@@ -201,10 +206,17 @@ $(document).ready(function(){
 
   $('#' + Settings.FORM_ID).on('change', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
     // this input was changed, add the changed data attribute to it
-    $(this).attr('data-changed', true)
+    $(this).attr('data-changed', true);
 
-    badgeSidebarForDifferences($(this))
-  })
+    badgeSidebarForDifferences($(this));
+  });
+
+  $('#' + Settings.FORM_ID).on('switchChange.bootstrapSwitch', 'input.toggle-checkbox', function(){
+    // this checkbox was changed, add the changed data attribute to it
+    $(this).attr('data-changed', true);
+
+    badgeSidebarForDifferences($(this));
+  });
 
   $('.advanced-toggle').click(function(){
     Settings.showAdvanced = !Settings.showAdvanced
@@ -735,6 +747,9 @@ function reloadSettings() {
     // call our method to setup the place names table
     setupPlacesTable();
 
+    // setup any bootstrap switches
+    $('.toggle-checkbox').bootstrapSwitch();
+
     // add tooltip to locked settings
     $('label.locked').tooltip({
       placement: 'right',
diff --git a/domain-server/resources/web/js/sweetalert.min.js b/domain-server/resources/web/settings/js/sweetalert.min.js
similarity index 100%
rename from domain-server/resources/web/js/sweetalert.min.js
rename to domain-server/resources/web/settings/js/sweetalert.min.js
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 4075ad133b..6bf5c62710 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -44,13 +44,10 @@ int const DomainServer::EXIT_CODE_REBOOT = 234923;
 
 const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.highfidelity.io";
 
-
-const QString ALLOWED_USERS_SETTINGS_KEYPATH = "security.allowed_users";
 const QString MAXIMUM_USER_CAPACITY = "security.maximum_user_capacity";
 const QString ALLOWED_EDITORS_SETTINGS_KEYPATH = "security.allowed_editors";
 const QString EDITORS_ARE_REZZERS_KEYPATH = "security.editors_are_rezzers";
 
-
 DomainServer::DomainServer(int argc, char* argv[]) :
     QCoreApplication(argc, argv),
     _httpManager(DOMAIN_SERVER_HTTP_PORT, QString("%1/resources/web/").arg(QCoreApplication::applicationDirPath()), this),
@@ -776,9 +773,8 @@ bool DomainServer::shouldAllowConnectionFromNode(const QString& username,
                                                  const HifiSockAddr& senderSockAddr,
                                                  QString& reasonReturn) {
 
-    const QVariant* allowedUsersVariant = valueForKeyPath(_settingsManager.getSettingsMap(),
-                                                                 ALLOWED_USERS_SETTINGS_KEYPATH);
-    QStringList allowedUsers = allowedUsersVariant ? allowedUsersVariant->toStringList() : QStringList();
+    bool isRestrictingAccess =
+        _settingsManager.valueOrDefaultValueForKeyPath(RESTRICTED_ACCESS_SETTINGS_KEYPATH).toBool();
 
     // we always let in a user who is sending a packet from our local socket or from the localhost address
     if (senderSockAddr.getAddress() == DependencyManager::get<LimitedNodeList>()->getLocalSockAddr().getAddress()
@@ -786,45 +782,50 @@ bool DomainServer::shouldAllowConnectionFromNode(const QString& username,
         return true;
     }
 
-    if (allowedUsers.count() > 0) {
+    if (isRestrictingAccess) {
+
+        QStringList allowedUsers =
+            _settingsManager.valueOrDefaultValueForKeyPath(ALLOWED_USERS_SETTINGS_KEYPATH).toStringList();
+
         if (allowedUsers.contains(username, Qt::CaseInsensitive)) {
-            if (verifyUsersKey(username, usernameSignature, reasonReturn)) {
-                return true;
+            if (!verifyUsersKey(username, usernameSignature, reasonReturn)) {
+                return false;
             }
         } else {
             qDebug() << "Connect request denied for user" << username << "not in allowed users list.";
             reasonReturn = "User not on whitelist.";
-        }
-        return false;
-    } else {
-        // we have no allowed user list.
 
-        // if this user is in the editors list, exempt them from the max-capacity check
-        const QVariant* allowedEditorsVariant =
-            valueForKeyPath(_settingsManager.getSettingsMap(), ALLOWED_EDITORS_SETTINGS_KEYPATH);
-        QStringList allowedEditors = allowedEditorsVariant ? allowedEditorsVariant->toStringList() : QStringList();
-        if (allowedEditors.contains(username)) {
-            if (verifyUsersKey(username, usernameSignature, reasonReturn)) {
-                return true;
-            }
+            return false;
         }
-
-        // if we haven't reached max-capacity, let them in.
-        const QVariant* maximumUserCapacityVariant = valueForKeyPath(_settingsManager.getSettingsMap(), MAXIMUM_USER_CAPACITY);
-        unsigned int maximumUserCapacity = maximumUserCapacityVariant ? maximumUserCapacityVariant->toUInt() : 0;
-        if (maximumUserCapacity > 0) {
-            unsigned int connectedUsers = countConnectedUsers();
-            if (connectedUsers >= maximumUserCapacity) {
-                // too many users, deny the new connection.
-                qDebug() << connectedUsers << "/" << maximumUserCapacity << "users connected, denying new connection.";
-                reasonReturn = "Too many connected users.";
-                return false;
-            }
-            qDebug() << connectedUsers << "/" << maximumUserCapacity << "users connected, perhaps allowing new connection.";
-        }
-
-        return true;
     }
+
+    // either we aren't restricting users, or this user is in the allowed list
+
+    // if this user is in the editors list, exempt them from the max-capacity check
+    const QVariant* allowedEditorsVariant =
+        valueForKeyPath(_settingsManager.getSettingsMap(), ALLOWED_EDITORS_SETTINGS_KEYPATH);
+    QStringList allowedEditors = allowedEditorsVariant ? allowedEditorsVariant->toStringList() : QStringList();
+    if (allowedEditors.contains(username)) {
+        if (verifyUsersKey(username, usernameSignature, reasonReturn)) {
+            return true;
+        }
+    }
+
+    // if we haven't reached max-capacity, let them in.
+    const QVariant* maximumUserCapacityVariant = valueForKeyPath(_settingsManager.getSettingsMap(), MAXIMUM_USER_CAPACITY);
+    unsigned int maximumUserCapacity = maximumUserCapacityVariant ? maximumUserCapacityVariant->toUInt() : 0;
+    if (maximumUserCapacity > 0) {
+        unsigned int connectedUsers = countConnectedUsers();
+        if (connectedUsers >= maximumUserCapacity) {
+            // too many users, deny the new connection.
+            qDebug() << connectedUsers << "/" << maximumUserCapacity << "users connected, denying new connection.";
+            reasonReturn = "Too many connected users.";
+            return false;
+        }
+        qDebug() << connectedUsers << "/" << maximumUserCapacity << "users connected, perhaps allowing new connection.";
+    }
+
+    return true;
 }
 
 void DomainServer::preloadAllowedUserPublicKeys() {
@@ -1255,10 +1256,8 @@ void DomainServer::sendHeartbeatToDataServer(const QString& networkAddress) {
     // add a flag to indicate if this domain uses restricted access - for now that will exclude it from listings
     const QString RESTRICTED_ACCESS_FLAG = "restricted";
 
-    const QVariant* allowedUsersVariant = valueForKeyPath(_settingsManager.getSettingsMap(),
-                                                          ALLOWED_USERS_SETTINGS_KEYPATH);
-    QStringList allowedUsers = allowedUsersVariant ? allowedUsersVariant->toStringList() : QStringList();
-    domainObject[RESTRICTED_ACCESS_FLAG] = (allowedUsers.size() > 0);
+    domainObject[RESTRICTED_ACCESS_FLAG] =
+        _settingsManager.valueOrDefaultValueForKeyPath(RESTRICTED_ACCESS_SETTINGS_KEYPATH).toBool();
 
     // add the number of currently connected agent users
     int numConnectedAuthedUsers = 0;
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 9e98c09093..c0d85687bb 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -14,6 +14,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
+#include <QtCore/QSettings>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QUrl>
 #include <QtCore/QUrlQuery>
@@ -42,33 +43,73 @@ DomainServerSettingsManager::DomainServerSettingsManager() :
     QFile descriptionFile(QCoreApplication::applicationDirPath() + SETTINGS_DESCRIPTION_RELATIVE_PATH);
     descriptionFile.open(QIODevice::ReadOnly);
 
-    _descriptionArray = QJsonDocument::fromJson(descriptionFile.readAll()).array();
+    QJsonDocument descriptionDocument = QJsonDocument::fromJson(descriptionFile.readAll());
+
+    if (descriptionDocument.isObject()) {
+        QJsonObject descriptionObject = descriptionDocument.object();
+
+        const QString DESCRIPTION_VERSION_KEY = "version";
+
+        if (descriptionObject.contains(DESCRIPTION_VERSION_KEY)) {
+            // read the version from the settings description
+            _descriptionVersion = descriptionObject[DESCRIPTION_VERSION_KEY].toDouble();
+
+            if (descriptionObject.contains(DESCRIPTION_SETTINGS_KEY)) {
+                _descriptionArray = descriptionDocument.object()[DESCRIPTION_SETTINGS_KEY].toArray();
+                return;
+            }
+        }
+    }
+
+    qCritical() << "Did not find settings decription in JSON at" << SETTINGS_DESCRIPTION_RELATIVE_PATH
+            << "- Unable to continue. domain-server will quit.";
+    QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
 }
 
 void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList) {
     _configMap.loadMasterAndUserConfig(argumentList);
 
-    // for now we perform a temporary transition from http-username and http-password to http_username and http_password
-    const QVariant* oldUsername = valueForKeyPath(_configMap.getUserConfig(), "security.http-username");
-    const QVariant* oldPassword = valueForKeyPath(_configMap.getUserConfig(), "security.http-password");
+    // What settings version were we before and what are we using now?
+    // Do we need to do any re-mapping?
+    QSettings appSettings;
+    const QString JSON_SETTINGS_VERSION_KEY = "json-settings/version";
+    double oldVersion = appSettings.value(JSON_SETTINGS_VERSION_KEY, 0.0).toDouble();
 
-    if (oldUsername || oldPassword) {
-        QVariantMap& settingsMap = *reinterpret_cast<QVariantMap*>(_configMap.getUserConfig()["security"].data());
+    if (oldVersion != _descriptionVersion) {
+        qDebug() << "Previous domain-server settings version was"
+            << QString::number(oldVersion, 'g', 8) << "and the new version is"
+            << QString::number(_descriptionVersion, 'g', 8) << "- checking if any re-mapping is required";
 
-        // remove old keys, move to new format
-        if (oldUsername) {
-            settingsMap["http_username"] = oldUsername->toString();
-            settingsMap.remove("http-username");
+        // we have a version mismatch - for now handle custom behaviour here since there are not many remappings
+        if (oldVersion < 1.0) {
+            // This was prior to the introduction of security.restricted_access
+            // If the user has a list of allowed users then set their value for security.restricted_access to true
+
+            QVariant* allowedUsers = valueForKeyPath(_configMap.getMergedConfig(), ALLOWED_USERS_SETTINGS_KEYPATH);
+
+            if (allowedUsers
+                && allowedUsers->canConvert(QMetaType::QVariantList)
+                && reinterpret_cast<QVariantList*>(allowedUsers)->size() > 0) {
+
+                qDebug() << "Forcing security.restricted_access to TRUE since there was an"
+                    << "existing list of allowed users.";
+
+                // In the pre-toggle system the user had a list of allowed users, so
+                // we need to set security.restricted_access to true
+                QVariant* restrictedAccess = valueForKeyPath(_configMap.getUserConfig(),
+                                                             RESTRICTED_ACCESS_SETTINGS_KEYPATH,
+                                                             true);
+
+                *restrictedAccess = QVariant(true);
+
+                // write the new settings to the json file
+                persistToFile();
+            }
         }
-
-        if (oldPassword) {
-            settingsMap["http_password"] = oldPassword->toString();
-            settingsMap.remove("http-password");
-        }
-
-        // save the updated settings
-        persistToFile();
     }
+
+    // write the current description version to our settings
+    appSettings.setValue(JSON_SETTINGS_VERSION_KEY, _descriptionVersion);
 }
 
 QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QString &keyPath) {
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index cf9c0525c8..21bf099ef0 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -23,6 +23,9 @@ const QString SETTINGS_PATHS_KEY = "paths";
 const QString SETTINGS_PATH = "/settings";
 const QString SETTINGS_PATH_JSON = SETTINGS_PATH + ".json";
 
+const QString ALLOWED_USERS_SETTINGS_KEYPATH = "security.allowed_users";
+const QString RESTRICTED_ACCESS_SETTINGS_KEYPATH = "security.restricted_access";
+
 class DomainServerSettingsManager : public QObject {
     Q_OBJECT
 public:
@@ -44,6 +47,7 @@ private:
     QJsonObject settingDescriptionFromGroup(const QJsonObject& groupObject, const QString& settingName);
     void persistToFile();
 
+    double _descriptionVersion;
     QJsonArray _descriptionArray;
     HifiConfigVariantMap _configMap;
 };
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index d8d1e9289b..34e0576e81 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -55,46 +55,46 @@ LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short
     static bool firstCall = true;
     if (firstCall) {
         NodeType::init();
-        
+
         // register the SharedNodePointer meta-type for signals/slots
         qRegisterMetaType<SharedNodePointer>();
         firstCall = false;
     }
-    
+
     _nodeSocket.bind(QHostAddress::AnyIPv4, socketListenPort);
     qCDebug(networking) << "NodeList socket is listening on" << _nodeSocket.localPort();
-    
+
     if (dtlsListenPort > 0) {
         // only create the DTLS socket during constructor if a custom port is passed
         _dtlsSocket = new QUdpSocket(this);
-        
+
         _dtlsSocket->bind(QHostAddress::AnyIPv4, dtlsListenPort);
         qCDebug(networking) << "NodeList DTLS socket is listening on" << _dtlsSocket->localPort();
     }
-    
+
     const int LARGER_BUFFER_SIZE = 1048576;
     changeSocketBufferSizes(LARGER_BUFFER_SIZE);
-    
+
     // check for local socket updates every so often
     const int LOCAL_SOCKET_UPDATE_INTERVAL_MSECS = 5 * 1000;
     QTimer* localSocketUpdate = new QTimer(this);
     connect(localSocketUpdate, &QTimer::timeout, this, &LimitedNodeList::updateLocalSockAddr);
     localSocketUpdate->start(LOCAL_SOCKET_UPDATE_INTERVAL_MSECS);
-    
+
     QTimer* silentNodeTimer = new QTimer(this);
     connect(silentNodeTimer, &QTimer::timeout, this, &LimitedNodeList::removeSilentNodes);
     silentNodeTimer->start(NODE_SILENCE_THRESHOLD_MSECS);
-    
+
     // check the local socket right now
     updateLocalSockAddr();
-    
+
     _packetStatTimer.start();
 }
 
 void LimitedNodeList::setSessionUUID(const QUuid& sessionUUID) {
     QUuid oldUUID = _sessionUUID;
     _sessionUUID = sessionUUID;
-    
+
     if (sessionUUID != oldUUID) {
         qCDebug(networking) << "NodeList UUID changed from" <<  uuidStringWithoutCurlyBraces(oldUUID)
         << "to" << uuidStringWithoutCurlyBraces(_sessionUUID);
@@ -120,16 +120,16 @@ QUdpSocket& LimitedNodeList::getDTLSSocket() {
     if (!_dtlsSocket) {
         // DTLS socket getter called but no DTLS socket exists, create it now
         _dtlsSocket = new QUdpSocket(this);
-        
+
         _dtlsSocket->bind(QHostAddress::AnyIPv4, 0, QAbstractSocket::DontShareAddress);
-        
+
         // we're using DTLS and our socket is good to go, so make the required DTLS changes
         // DTLS requires that IP_DONTFRAG be set
         // This is not accessible on some platforms (OS X) so we need to make sure DTLS still works without it
-        
+
         qCDebug(networking) << "LimitedNodeList DTLS socket is listening on" << _dtlsSocket->localPort();
     }
-    
+
     return *_dtlsSocket;
 }
 
@@ -140,7 +140,7 @@ void LimitedNodeList::changeSocketBufferSizes(int numBytes) {
         if (i == 0) {
             bufferOpt = QAbstractSocket::SendBufferSizeSocketOption;
             bufferTypeString = "send";
-            
+
         } else {
             bufferOpt = QAbstractSocket::ReceiveBufferSizeSocketOption;
             bufferTypeString = "receive";
@@ -148,7 +148,7 @@ void LimitedNodeList::changeSocketBufferSizes(int numBytes) {
         int oldBufferSize = _nodeSocket.socketOption(bufferOpt).toInt();
         if (oldBufferSize < numBytes) {
             int newBufferSize = _nodeSocket.socketOption(bufferOpt).toInt();
-            
+
             qCDebug(networking) << "Changed socket" << bufferTypeString << "buffer size from" << oldBufferSize << "to"
                 << newBufferSize << "bytes";
         } else {
@@ -162,13 +162,13 @@ void LimitedNodeList::changeSocketBufferSizes(int numBytes) {
 bool LimitedNodeList::packetVersionAndHashMatch(const QByteArray& packet) {
     PacketType checkType = packetTypeForPacket(packet);
     int numPacketTypeBytes = numBytesArithmeticCodingFromBuffer(packet.data());
-    
+
     if (packet[numPacketTypeBytes] != versionForPacketType(checkType)
         && checkType != PacketTypeStunResponse) {
         PacketType mismatchType = packetTypeForPacket(packet);
-        
+
         static QMultiMap<QUuid, PacketType> versionDebugSuppressMap;
-        
+
         QUuid senderUUID = uuidFromPacketHeader(packet);
         if (!versionDebugSuppressMap.contains(senderUUID, checkType)) {
             qCDebug(networking) << "Packet version mismatch on" << packetTypeForPacket(packet) << "- Sender"
@@ -176,13 +176,13 @@ bool LimitedNodeList::packetVersionAndHashMatch(const QByteArray& packet) {
             << qPrintable(QString::number(versionForPacketType(mismatchType))) << "expected.";
 
             emit packetVersionMismatch();
-            
+
             versionDebugSuppressMap.insert(senderUUID, checkType);
         }
-        
+
         return false;
     }
-    
+
     if (!NON_VERIFIED_PACKETS.contains(checkType)) {
         // figure out which node this is from
         SharedNodePointer sendingNode = sendingNodeForPacket(packet);
@@ -192,26 +192,26 @@ bool LimitedNodeList::packetVersionAndHashMatch(const QByteArray& packet) {
                 return true;
             } else {
                 static QMultiMap<QUuid, PacketType> hashDebugSuppressMap;
-                
+
                 QUuid senderUUID = uuidFromPacketHeader(packet);
                 if (!hashDebugSuppressMap.contains(senderUUID, checkType)) {
                     qCDebug(networking) << "Packet hash mismatch on" << checkType << "- Sender"
                     << uuidFromPacketHeader(packet);
-                    
+
                     hashDebugSuppressMap.insert(senderUUID, checkType);
                 }
             }
         } else {
             static QString repeatedMessage
                 = LogHandler::getInstance().addRepeatedMessageRegex("Packet of type \\d+ received from unknown node with UUID");
-            
+
             qCDebug(networking) << "Packet of type" << checkType << "received from unknown node with UUID"
                 << qPrintable(uuidStringWithoutCurlyBraces(uuidFromPacketHeader(packet)));
         }
     } else {
         return true;
     }
-    
+
     return false;
 }
 
@@ -226,7 +226,7 @@ qint64 LimitedNodeList::readDatagram(QByteArray& incomingPacket, QHostAddress* a
     } else {
         emit dataReceived(NodeType::Unassigned, incomingPacket.size());
     }
-        
+
     return result;
 }
 
@@ -235,14 +235,14 @@ qint64 LimitedNodeList::writeDatagram(const QByteArray& datagram, const HifiSock
     // stat collection for packets
     ++_numCollectedPackets;
     _numCollectedBytes += datagram.size();
-    
+
     qint64 bytesWritten = _nodeSocket.writeDatagram(datagram,
                                                     destinationSockAddr.getAddress(), destinationSockAddr.getPort());
-    
+
     if (bytesWritten < 0) {
         qCDebug(networking) << "ERROR in writeDatagram:" << _nodeSocket.error() << "-" << _nodeSocket.errorString();
     }
-    
+
     return bytesWritten;
 }
 
@@ -269,7 +269,7 @@ qint64 LimitedNodeList::writeDatagram(const QByteArray& datagram,
         }
 
         QByteArray datagramCopy = datagram;
-        
+
         // if we're here and the connection secret is null, debug out - this could be a problem
         if (destinationNode->getConnectionSecret().isNull()) {
             qDebug() << "LimitedNodeList::writeDatagram called for verified datagram with null connection secret for"
@@ -278,21 +278,21 @@ qint64 LimitedNodeList::writeDatagram(const QByteArray& datagram,
         }
 
         // perform replacement of hash and optionally also sequence number in the header
-        if (SEQUENCE_NUMBERED_PACKETS.contains(packetType)) { 
+        if (SEQUENCE_NUMBERED_PACKETS.contains(packetType)) {
             PacketSequenceNumber sequenceNumber = getNextSequenceNumberForPacket(destinationNode->getUUID(), packetType);
             replaceHashAndSequenceNumberInPacket(datagramCopy, destinationNode->getConnectionSecret(),
                                                  sequenceNumber, packetType);
         } else {
             replaceHashInPacket(datagramCopy, destinationNode->getConnectionSecret(), packetType);
         }
-        
+
         emit dataSent(destinationNode->getType(), datagram.size());
         auto bytesWritten = writeDatagram(datagramCopy, *destinationSockAddr);
         // Keep track of per-destination-node bandwidth
         destinationNode->recordBytesSent(bytesWritten);
         return bytesWritten;
     }
-    
+
     // didn't have a destinationNode to send to, return 0
     return 0;
 }
@@ -311,7 +311,7 @@ qint64 LimitedNodeList::writeUnverifiedDatagram(const QByteArray& datagram, cons
                 return 0;
             }
         }
-        
+
         PacketType packetType = packetTypeForPacket(datagram);
 
         // optionally peform sequence number replacement in the header
@@ -328,7 +328,7 @@ qint64 LimitedNodeList::writeUnverifiedDatagram(const QByteArray& datagram, cons
             return writeDatagram(datagram, *destinationSockAddr);
         }
     }
-    
+
     // didn't have a destinationNode to send to, return 0
     return 0;
 }
@@ -348,11 +348,11 @@ qint64 LimitedNodeList::writeUnverifiedDatagram(const char* data, qint64 size, c
 }
 
 PacketSequenceNumber LimitedNodeList::getNextSequenceNumberForPacket(const QUuid& nodeUUID, PacketType packetType) {
-    // Thanks to std::map and std::unordered_map this line either default constructs the 
+    // Thanks to std::map and std::unordered_map this line either default constructs the
     // PacketTypeSequenceMap and the PacketSequenceNumber or returns the existing value.
-    // We use the postfix increment so that the stored value is incremented and the next 
+    // We use the postfix increment so that the stored value is incremented and the next
     // return gives the correct value.
-    
+
     return _packetSequenceNumbers[nodeUUID][packetType]++;
 }
 
@@ -367,21 +367,21 @@ void LimitedNodeList::processNodeData(const HifiSockAddr& senderSockAddr, const
 
 int LimitedNodeList::updateNodeWithDataFromPacket(const SharedNodePointer& matchingNode, const QByteArray &packet) {
     QMutexLocker locker(&matchingNode->getMutex());
-    
+
     matchingNode->setLastHeardMicrostamp(usecTimestampNow());
-    
+
     // if this was a sequence numbered packet we should store the last seq number for
     // a packet of this type for this node
     PacketType packetType = packetTypeForPacket(packet);
     if (SEQUENCE_NUMBERED_PACKETS.contains(packetType)) {
         matchingNode->setLastSequenceNumberForPacketType(sequenceNumberFromHeader(packet, packetType), packetType);
     }
-    
+
     NodeData* linkedData = matchingNode->getLinkedData();
     if (!linkedData && linkedDataCreateCallback) {
         linkedDataCreateCallback(matchingNode.data());
     }
-   
+
     if (linkedData) {
         QMutexLocker linkedDataLocker(&linkedData->getMutex());
         return linkedData->parseData(packet);
@@ -391,42 +391,42 @@ int LimitedNodeList::updateNodeWithDataFromPacket(const SharedNodePointer& match
 
 int LimitedNodeList::findNodeAndUpdateWithDataFromPacket(const QByteArray& packet) {
     SharedNodePointer matchingNode = sendingNodeForPacket(packet);
-    
+
     if (matchingNode) {
         return updateNodeWithDataFromPacket(matchingNode, packet);
     }
-    
+
     // we weren't able to match the sender address to the address we have for this node, unlock and don't parse
     return 0;
 }
 
 SharedNodePointer LimitedNodeList::nodeWithUUID(const QUuid& nodeUUID) {
     QReadLocker readLocker(&_nodeMutex);
-    
+
     NodeHash::const_iterator it = _nodeHash.find(nodeUUID);
     return it == _nodeHash.cend() ? SharedNodePointer() : it->second;
  }
 
 SharedNodePointer LimitedNodeList::sendingNodeForPacket(const QByteArray& packet) {
     QUuid nodeUUID = uuidFromPacketHeader(packet);
-    
+
     // return the matching node, or NULL if there is no match
     return nodeWithUUID(nodeUUID);
 }
 
 void LimitedNodeList::eraseAllNodes() {
     qCDebug(networking) << "Clearing the NodeList. Deleting all nodes in list.";
-    
+
     QSet<SharedNodePointer> killedNodes;
     eachNode([&killedNodes](const SharedNodePointer& node){
         killedNodes.insert(node);
     });
-    
+
     // iterate the current nodes, emit that they are dying and remove them from the hash
     _nodeMutex.lockForWrite();
     _nodeHash.clear();
     _nodeMutex.unlock();
-    
+
     foreach(const SharedNodePointer& killedNode, killedNodes) {
         handleNodeKill(killedNode);
     }
@@ -438,17 +438,17 @@ void LimitedNodeList::reset() {
 
 void LimitedNodeList::killNodeWithUUID(const QUuid& nodeUUID) {
     _nodeMutex.lockForRead();
-    
+
     NodeHash::iterator it = _nodeHash.find(nodeUUID);
     if (it != _nodeHash.end()) {
         SharedNodePointer matchingNode = it->second;
-        
+
         _nodeMutex.unlock();
-        
+
         _nodeMutex.lockForWrite();
         _nodeHash.unsafe_erase(it);
         _nodeMutex.unlock();
-        
+
         handleNodeKill(matchingNode);
     } else {
         _nodeMutex.unlock();
@@ -472,34 +472,34 @@ SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t
                                                    const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket,
                                                    bool canAdjustLocks, bool canRez) {
     NodeHash::const_iterator it = _nodeHash.find(uuid);
-    
+
     if (it != _nodeHash.end()) {
         SharedNodePointer& matchingNode = it->second;
-        
+
         matchingNode->setPublicSocket(publicSocket);
         matchingNode->setLocalSocket(localSocket);
         matchingNode->setCanAdjustLocks(canAdjustLocks);
         matchingNode->setCanRez(canRez);
-        
+
         return matchingNode;
     } else {
         // we didn't have this node, so add them
         Node* newNode = new Node(uuid, nodeType, publicSocket, localSocket, canAdjustLocks, canRez);
         SharedNodePointer newNodePointer(newNode);
-        
+
         _nodeHash.insert(UUIDNodePair(newNode->getUUID(), newNodePointer));
-        
+
         qCDebug(networking) << "Added" << *newNode;
-        
+
         emit nodeAdded(newNodePointer);
-        
+
         return newNodePointer;
     }
 }
 
 unsigned LimitedNodeList::broadcastToNodes(const QByteArray& packet, const NodeSet& destinationNodeTypes) {
     unsigned n = 0;
-    
+
     eachNode([&](const SharedNodePointer& node){
         if (destinationNodeTypes.contains(node->getType())) {
             writeDatagram(packet, node);
@@ -516,35 +516,35 @@ QByteArray LimitedNodeList::constructPingPacket(PingType_t pingType, bool isVeri
 
     QByteArray pingPacket = byteArrayWithUUIDPopulatedHeader(isVerified ? PacketTypePing : PacketTypeUnverifiedPing,
                                                              packetUUID);
-    
+
     QDataStream packetStream(&pingPacket, QIODevice::Append);
-    
+
     packetStream << pingType;
     packetStream << usecTimestampNow();
-    
+
     return pingPacket;
 }
 
 QByteArray LimitedNodeList::constructPingReplyPacket(const QByteArray& pingPacket, const QUuid& packetHeaderID) {
     QDataStream pingPacketStream(pingPacket);
     pingPacketStream.skipRawData(numBytesForPacketHeader(pingPacket));
-    
+
     PingType_t typeFromOriginalPing;
     pingPacketStream >> typeFromOriginalPing;
-    
+
     quint64 timeFromOriginalPing;
     pingPacketStream >> timeFromOriginalPing;
-    
+
     PacketType replyType = (packetTypeForPacket(pingPacket) == PacketTypePing)
         ? PacketTypePingReply : PacketTypeUnverifiedPingReply;
-   
+
     QUuid packetUUID = packetHeaderID.isNull() ? _sessionUUID : packetHeaderID;
 
     QByteArray replyPacket = byteArrayWithUUIDPopulatedHeader(replyType, packetUUID);
     QDataStream packetStream(&replyPacket, QIODevice::Append);
-    
+
     packetStream << typeFromOriginalPing << timeFromOriginalPing << usecTimestampNow();
-    
+
     return replyPacket;
 }
 
@@ -566,9 +566,9 @@ void LimitedNodeList::resetPacketStats() {
 }
 
 void LimitedNodeList::removeSilentNodes() {
-    
+
     QSet<SharedNodePointer> killedNodes;
-    
+
     eachNodeHashIterator([&](NodeHash::iterator& it){
         SharedNodePointer node = it->second;
         node->getMutex().lock();
@@ -582,10 +582,10 @@ void LimitedNodeList::removeSilentNodes() {
             // we didn't erase this node, push the iterator forwards
             ++it;
         }
-        
+
         node->getMutex().unlock();
     });
-    
+
     foreach(const SharedNodePointer& killedNode, killedNodes) {
         handleNodeKill(killedNode);
     }
@@ -595,38 +595,38 @@ const uint32_t RFC_5389_MAGIC_COOKIE = 0x2112A442;
 const int NUM_BYTES_STUN_HEADER = 20;
 
 void LimitedNodeList::sendSTUNRequest() {
-    
+
     unsigned char stunRequestPacket[NUM_BYTES_STUN_HEADER];
-    
+
     int packetIndex = 0;
-    
+
     const uint32_t RFC_5389_MAGIC_COOKIE_NETWORK_ORDER = htonl(RFC_5389_MAGIC_COOKIE);
-    
+
     // leading zeros + message type
     const uint16_t REQUEST_MESSAGE_TYPE = htons(0x0001);
     memcpy(stunRequestPacket + packetIndex, &REQUEST_MESSAGE_TYPE, sizeof(REQUEST_MESSAGE_TYPE));
     packetIndex += sizeof(REQUEST_MESSAGE_TYPE);
-    
+
     // message length (no additional attributes are included)
     uint16_t messageLength = 0;
     memcpy(stunRequestPacket + packetIndex, &messageLength, sizeof(messageLength));
     packetIndex += sizeof(messageLength);
-    
+
     memcpy(stunRequestPacket + packetIndex, &RFC_5389_MAGIC_COOKIE_NETWORK_ORDER, sizeof(RFC_5389_MAGIC_COOKIE_NETWORK_ORDER));
     packetIndex += sizeof(RFC_5389_MAGIC_COOKIE_NETWORK_ORDER);
-    
+
     // transaction ID (random 12-byte unsigned integer)
     const uint NUM_TRANSACTION_ID_BYTES = 12;
     QUuid randomUUID = QUuid::createUuid();
     memcpy(stunRequestPacket + packetIndex, randomUUID.toRfc4122().data(), NUM_TRANSACTION_ID_BYTES);
-    
+
     _nodeSocket.writeDatagram((char*) stunRequestPacket, sizeof(stunRequestPacket),
                               _stunSockAddr.getAddress(), _stunSockAddr.getPort());
 }
 
 void LimitedNodeList::rebindNodeSocket() {
     quint16 oldPort = _nodeSocket.localPort();
-    
+
     _nodeSocket.close();
     _nodeSocket.bind(QHostAddress::AnyIPv4, oldPort);
 }
@@ -636,125 +636,125 @@ bool LimitedNodeList::processSTUNResponse(const QByteArray& packet) {
     // and read the first attribute and make sure it is a XOR_MAPPED_ADDRESS
     const int NUM_BYTES_MESSAGE_TYPE_AND_LENGTH = 4;
     const uint16_t XOR_MAPPED_ADDRESS_TYPE = htons(0x0020);
-    
+
     const uint32_t RFC_5389_MAGIC_COOKIE_NETWORK_ORDER = htonl(RFC_5389_MAGIC_COOKIE);
-    
+
     int attributeStartIndex = NUM_BYTES_STUN_HEADER;
-    
+
     if (memcmp(packet.data() + NUM_BYTES_MESSAGE_TYPE_AND_LENGTH,
                &RFC_5389_MAGIC_COOKIE_NETWORK_ORDER,
                sizeof(RFC_5389_MAGIC_COOKIE_NETWORK_ORDER)) == 0) {
-        
+
         // enumerate the attributes to find XOR_MAPPED_ADDRESS_TYPE
         while (attributeStartIndex < packet.size()) {
             if (memcmp(packet.data() + attributeStartIndex, &XOR_MAPPED_ADDRESS_TYPE, sizeof(XOR_MAPPED_ADDRESS_TYPE)) == 0) {
                 const int NUM_BYTES_STUN_ATTR_TYPE_AND_LENGTH = 4;
                 const int NUM_BYTES_FAMILY_ALIGN = 1;
                 const uint8_t IPV4_FAMILY_NETWORK_ORDER = htons(0x01) >> 8;
-                
-                
-                
+
+
+
                 int byteIndex = attributeStartIndex + NUM_BYTES_STUN_ATTR_TYPE_AND_LENGTH + NUM_BYTES_FAMILY_ALIGN;
-                
+
                 uint8_t addressFamily = 0;
                 memcpy(&addressFamily, packet.data() + byteIndex, sizeof(addressFamily));
-                
+
                 byteIndex += sizeof(addressFamily);
-                
+
                 if (addressFamily == IPV4_FAMILY_NETWORK_ORDER) {
                     // grab the X-Port
                     uint16_t xorMappedPort = 0;
                     memcpy(&xorMappedPort, packet.data() + byteIndex, sizeof(xorMappedPort));
-                    
+
                     uint16_t newPublicPort = ntohs(xorMappedPort) ^ (ntohl(RFC_5389_MAGIC_COOKIE_NETWORK_ORDER) >> 16);
-                    
+
                     byteIndex += sizeof(xorMappedPort);
-                    
+
                     // grab the X-Address
                     uint32_t xorMappedAddress = 0;
                     memcpy(&xorMappedAddress, packet.data() + byteIndex, sizeof(xorMappedAddress));
-                    
+
                     uint32_t stunAddress = ntohl(xorMappedAddress) ^ ntohl(RFC_5389_MAGIC_COOKIE_NETWORK_ORDER);
-                    
+
                     QHostAddress newPublicAddress = QHostAddress(stunAddress);
-                    
+
                     if (newPublicAddress != _publicSockAddr.getAddress() || newPublicPort != _publicSockAddr.getPort()) {
                         _publicSockAddr = HifiSockAddr(newPublicAddress, newPublicPort);
-                        
+
                         qCDebug(networking, "New public socket received from STUN server is %s:%hu",
                                _publicSockAddr.getAddress().toString().toLocal8Bit().constData(),
                                _publicSockAddr.getPort());
-                        
-                        emit publicSockAddrChanged(_publicSockAddr);                        
+
+                        emit publicSockAddrChanged(_publicSockAddr);
                     }
-                    
+
                     return true;
                 }
             } else {
                 // push forward attributeStartIndex by the length of this attribute
                 const int NUM_BYTES_ATTRIBUTE_TYPE = 2;
-                
+
                 uint16_t attributeLength = 0;
                 memcpy(&attributeLength, packet.data() + attributeStartIndex + NUM_BYTES_ATTRIBUTE_TYPE,
                        sizeof(attributeLength));
                 attributeLength = ntohs(attributeLength);
-                
+
                 attributeStartIndex += NUM_BYTES_MESSAGE_TYPE_AND_LENGTH + attributeLength;
             }
         }
     }
-    
+
     return false;
 }
 
 void LimitedNodeList::updateLocalSockAddr() {
     HifiSockAddr newSockAddr(getLocalAddress(), _nodeSocket.localPort());
     if (newSockAddr != _localSockAddr) {
-        
+
         if (_localSockAddr.isNull()) {
             qCDebug(networking) << "Local socket is" << newSockAddr;
         } else {
             qCDebug(networking) << "Local socket has changed from" << _localSockAddr << "to" << newSockAddr;
         }
-        
+
         _localSockAddr = newSockAddr;
-        
+
         emit localSockAddrChanged(_localSockAddr);
     }
 }
 
 void LimitedNodeList::sendHeartbeatToIceServer(const HifiSockAddr& iceServerSockAddr,
                                                QUuid headerID, const QUuid& connectionRequestID) {
-    
+
     if (headerID.isNull()) {
         headerID = _sessionUUID;
     }
-    
+
     QByteArray iceRequestByteArray = byteArrayWithUUIDPopulatedHeader(PacketTypeIceServerHeartbeat, headerID);
     QDataStream iceDataStream(&iceRequestByteArray, QIODevice::Append);
-    
+
     iceDataStream << _publicSockAddr << _localSockAddr;
-    
+
     if (!connectionRequestID.isNull()) {
         iceDataStream << connectionRequestID;
-        
+
         qCDebug(networking) << "Sending packet to ICE server to request connection info for peer with ID"
             << uuidStringWithoutCurlyBraces(connectionRequestID);
     }
-    
+
     writeUnverifiedDatagram(iceRequestByteArray, iceServerSockAddr);
 }
 
 void LimitedNodeList::putLocalPortIntoSharedMemory(const QString key, QObject* parent, quint16 localPort) {
     // save our local port to shared memory so that assignment client children know how to talk to this parent
     QSharedMemory* sharedPortMem = new QSharedMemory(key, parent);
-    
+
     // attempt to create the shared memory segment
     if (sharedPortMem->create(sizeof(localPort)) || sharedPortMem->attach()) {
         sharedPortMem->lock();
         memcpy(sharedPortMem->data(), &localPort, sizeof(localPort));
         sharedPortMem->unlock();
-        
+
         qCDebug(networking) << "Wrote local listening port" << localPort << "to shared memory at key" << key;
     } else {
         qWarning() << "Failed to create and attach to shared memory to share local port with assignment-client children.";
@@ -762,22 +762,15 @@ void LimitedNodeList::putLocalPortIntoSharedMemory(const QString key, QObject* p
 }
 
 
-bool LimitedNodeList::getLocalServerPortFromSharedMemory(const QString key, QSharedMemory*& sharedMem,
-                                                         quint16& localPort) {
-    if (!sharedMem) {
-        sharedMem = new QSharedMemory(key, this);
-                
-        if (!sharedMem->attach(QSharedMemory::ReadOnly)) {
-            qWarning() << "Could not attach to shared memory at key" << key;
-        }
-    }
-
-    if (sharedMem->isAttached()) {
-        sharedMem->lock();
-        memcpy(&localPort, sharedMem->data(), sizeof(localPort));
-        sharedMem->unlock();
+bool LimitedNodeList::getLocalServerPortFromSharedMemory(const QString key, quint16& localPort) {
+    QSharedMemory sharedMem(key);
+    if (!sharedMem.attach(QSharedMemory::ReadOnly)) {
+        qWarning() << "Could not attach to shared memory at key" << key;
+        return false;
+    } else {
+        sharedMem.lock();
+        memcpy(&localPort, sharedMem.data(), sizeof(localPort));
+        sharedMem.unlock();
         return true;
     }
-
-    return false;
 }
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index ce941b8d24..3401cd7ca8 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -79,7 +79,7 @@ namespace PingType {
 class LimitedNodeList : public QObject, public Dependency {
     Q_OBJECT
     SINGLETON_DEPENDENCY
-    
+
 public:
     const QUuid& getSessionUUID() const { return _sessionUUID; }
     void setSessionUUID(const QUuid& sessionUUID);
@@ -89,22 +89,22 @@ public:
 
     bool getThisNodeCanRez() const { return _thisNodeCanRez; }
     void setThisNodeCanRez(bool canRez);
-    
+
     void rebindNodeSocket();
     QUdpSocket& getNodeSocket() { return _nodeSocket; }
     QUdpSocket& getDTLSSocket();
-    
+
     bool packetVersionAndHashMatch(const QByteArray& packet);
 
-    QByteArray byteArrayWithPopulatedHeader(PacketType packetType) 
+    QByteArray byteArrayWithPopulatedHeader(PacketType packetType)
         { return byteArrayWithUUIDPopulatedHeader(packetType, _sessionUUID); }
-    int populatePacketHeader(QByteArray& packet, PacketType packetType) 
+    int populatePacketHeader(QByteArray& packet, PacketType packetType)
         { return populatePacketHeaderWithUUID(packet, packetType, _sessionUUID); }
-    int populatePacketHeader(char* packet, PacketType packetType) 
+    int populatePacketHeader(char* packet, PacketType packetType)
         { return populatePacketHeaderWithUUID(packet, packetType, _sessionUUID); }
 
     qint64 readDatagram(QByteArray& incomingPacket, QHostAddress* address, quint16 * port);
-    
+
     qint64 writeDatagram(const QByteArray& datagram, const SharedNodePointer& destinationNode,
                          const HifiSockAddr& overridenSockAddr = HifiSockAddr());
 
@@ -120,16 +120,16 @@ public:
                          const HifiSockAddr& overridenSockAddr = HifiSockAddr());
 
     void (*linkedDataCreateCallback)(Node *);
-    
+
     int size() const { return _nodeHash.size(); }
 
     SharedNodePointer nodeWithUUID(const QUuid& nodeUUID);
     SharedNodePointer sendingNodeForPacket(const QByteArray& packet);
-    
+
     SharedNodePointer addOrUpdateNode(const QUuid& uuid, NodeType_t nodeType,
                                       const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket,
                                       bool canAdjustLocks, bool canRez);
-    
+
     const HifiSockAddr& getLocalSockAddr() const { return _localSockAddr; }
     const HifiSockAddr& getSTUNSockAddr() const { return _stunSockAddr; }
 
@@ -144,21 +144,21 @@ public:
 
     void getPacketStats(float &packetsPerSecond, float &bytesPerSecond);
     void resetPacketStats();
-    
+
     QByteArray constructPingPacket(PingType_t pingType = PingType::Agnostic, bool isVerified = true,
                                    const QUuid& packetHeaderID = QUuid());
     QByteArray constructPingReplyPacket(const QByteArray& pingPacket, const QUuid& packetHeaderID = QUuid());
-    
+
     virtual void sendSTUNRequest();
     virtual bool processSTUNResponse(const QByteArray& packet);
-    
+
     void sendHeartbeatToIceServer(const HifiSockAddr& iceServerSockAddr,
                                   QUuid headerID = QUuid(), const QUuid& connectRequestID = QUuid());
-    
+
     template<typename NodeLambda>
     void eachNode(NodeLambda functor) {
         QReadLocker readLock(&_nodeMutex);
-        
+
         for (NodeHash::const_iterator it = _nodeHash.cbegin(); it != _nodeHash.cend(); ++it) {
             functor(it->second);
         }
@@ -178,44 +178,44 @@ public:
     template<typename BreakableNodeLambda>
     void eachNodeBreakable(BreakableNodeLambda functor) {
         QReadLocker readLock(&_nodeMutex);
-        
+
         for (NodeHash::const_iterator it = _nodeHash.cbegin(); it != _nodeHash.cend(); ++it) {
             if (!functor(it->second)) {
                 break;
             }
         }
     }
-    
+
     template<typename PredLambda>
     SharedNodePointer nodeMatchingPredicate(const PredLambda predicate) {
         QReadLocker readLock(&_nodeMutex);
-        
+
         for (NodeHash::const_iterator it = _nodeHash.cbegin(); it != _nodeHash.cend(); ++it) {
             if (predicate(it->second)) {
                 return it->second;
             }
         }
-        
+
         return SharedNodePointer();
     }
 
     void putLocalPortIntoSharedMemory(const QString key, QObject* parent, quint16 localPort);
-    bool getLocalServerPortFromSharedMemory(const QString key, QSharedMemory*& sharedMem, quint16& localPort);
-    
+    bool getLocalServerPortFromSharedMemory(const QString key, quint16& localPort);
+
 public slots:
     void reset();
     void eraseAllNodes();
-    
+
     void removeSilentNodes();
-    
+
     void updateLocalSockAddr();
-    
+
     void killNodeWithUUID(const QUuid& nodeUUID);
 signals:
     void uuidChanged(const QUuid& ownerUUID, const QUuid& oldUUID);
     void nodeAdded(SharedNodePointer);
     void nodeKilled(SharedNodePointer);
-    
+
     void localSockAddrChanged(const HifiSockAddr& localSockAddr);
     void publicSockAddrChanged(const HifiSockAddr& publicSockAddr);
 
@@ -226,18 +226,18 @@ signals:
     void dataReceived(const quint8 channel_type, const int bytes);
 
     void packetVersionMismatch();
-    
+
 protected:
     LimitedNodeList(unsigned short socketListenPort = 0, unsigned short dtlsListenPort = 0);
     LimitedNodeList(LimitedNodeList const&); // Don't implement, needed to avoid copies of singleton
     void operator=(LimitedNodeList const&); // Don't implement, needed to avoid copies of singleton
-    
+
     qint64 writeDatagram(const QByteArray& datagram, const HifiSockAddr& destinationSockAddr);
 
     PacketSequenceNumber getNextSequenceNumberForPacket(const QUuid& nodeUUID, PacketType packetType);
-    
+
     void changeSocketBufferSizes(int numBytes);
-    
+
     void handleNodeKill(const SharedNodePointer& node);
 
     QUuid _sessionUUID;
@@ -258,17 +258,17 @@ protected:
     bool _thisNodeCanRez;
 
     std::unordered_map<QUuid, PacketTypeSequenceMap, UUIDHasher> _packetSequenceNumbers;
-    
+
     template<typename IteratorLambda>
     void eachNodeHashIterator(IteratorLambda functor) {
         QWriteLocker writeLock(&_nodeMutex);
         NodeHash::iterator it = _nodeHash.begin();
-        
+
         while (it != _nodeHash.end()) {
             functor(it);
         }
     }
-    
+
 };
 
 #endif // hifi_LimitedNodeList_h
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index dcfb006b2b..b39503f709 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -335,12 +335,8 @@ void NodeList::sendDomainServerCheckIn() {
             if (_domainHandler.getSockAddr().getAddress() == QHostAddress::LocalHost
                 || _domainHandler.getHostname() == "localhost") {
 
-                static QSharedMemory* localDSPortSharedMem = NULL;
-
                 quint16 domainPort = DEFAULT_DOMAIN_SERVER_PORT;
-                getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY,
-                                                   localDSPortSharedMem,
-                                                   domainPort);
+                getLocalServerPortFromSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, domainPort);
                 qCDebug(networking) << "Local domain-server port read from shared memory (or default) is" << domainPort;
                 _domainHandler.setPort(domainPort);
             }
diff --git a/libraries/shared/src/HifiConfigVariantMap.cpp b/libraries/shared/src/HifiConfigVariantMap.cpp
index 3fe5d9ec3f..4f9a741aad 100644
--- a/libraries/shared/src/HifiConfigVariantMap.cpp
+++ b/libraries/shared/src/HifiConfigVariantMap.cpp
@@ -159,16 +159,17 @@ void HifiConfigVariantMap::addMissingValuesToExistingMap(QVariantMap& existingMa
     }
 }
 
-QVariant* valueForKeyPath(QVariantMap& variantMap, const QString& keyPath) {
+QVariant* valueForKeyPath(QVariantMap& variantMap, const QString& keyPath, bool shouldCreateIfMissing) {
     int dotIndex = keyPath.indexOf('.');
 
     QString firstKey = (dotIndex == -1) ? keyPath : keyPath.mid(0, dotIndex);
 
-    if (variantMap.contains(firstKey)) {
+    if (shouldCreateIfMissing || variantMap.contains(firstKey)) {
         if (dotIndex == -1) {
             return &variantMap[firstKey];
         } else if (variantMap[firstKey].canConvert(QMetaType::QVariantMap)) {
-            return valueForKeyPath(*static_cast<QVariantMap*>(variantMap[firstKey].data()), keyPath.mid(dotIndex + 1));
+            return valueForKeyPath(*static_cast<QVariantMap*>(variantMap[firstKey].data()), keyPath.mid(dotIndex + 1),
+                                   shouldCreateIfMissing);
         }
     }
 
diff --git a/libraries/shared/src/HifiConfigVariantMap.h b/libraries/shared/src/HifiConfigVariantMap.h
index 3566f446a2..75b8be1984 100644
--- a/libraries/shared/src/HifiConfigVariantMap.h
+++ b/libraries/shared/src/HifiConfigVariantMap.h
@@ -37,6 +37,6 @@ private:
     void addMissingValuesToExistingMap(QVariantMap& existingMap, const QVariantMap& newMap);
 };
 
-QVariant* valueForKeyPath(QVariantMap& variantMap, const QString& keyPath);
+QVariant* valueForKeyPath(QVariantMap& variantMap, const QString& keyPath, bool shouldCreateIfMissing = false);
 
 #endif // hifi_HifiConfigVariantMap_h