diff --git a/hosts b/hosts
index 6b7a984..4dce322 100644
--- a/hosts
+++ b/hosts
@@ -1,112 +1,74 @@
-sdwcltm2	ansible_host=192.168.50.2	site_clli=CRHMNJAW
-sdwcltm3	ansible_host=192.168.201.55	site_clli=MTLRNJIK
-sdwcltm5	ansible_host=192.168.35.1	site_clli=PHLJPAMT
-sdwsrvm		ansible_host=192.168.60.2	site_clli=WLGRPABW
-sdwcltm8 	ansible_host=192.168.150.2	site_clli=FTCLCORN
-ubuntu-server-2	ansible_host=192.168.198.2	site_clli=CMCYCOJL
-sdwcltm7	ansible_host=192.168.199.2	site_clli=SRSPNYGN
-sdwsrvl		ansible_host=192.168.90.2	site_clli=LSBGFL59
-sdwcltm4	ansible_host=192.168.100.2	site_clli=PROVUTZZ
-sdwcltm6	ansible_host=192.168.200.34	site_clli=PHLJPAMT
-ubuntu-server-1	ansible_host=192.168.201.2	site_clli=MTLRNJIK
-sdwcltm9	ansible_host=192.168.200.163 	site_clli=NRCRGAQN
-#192.168.201.3
-ipsectest1	ansible_host=192.168.201.90
-ssh-jump	ansible_host=192.168.201.9
-
-[pi]
-sdwcltm2
-sdwcltm3
-sdwcltm5
-sdwsrvm
-sdwcltm8
-sdwcltm6
-sdwcltm7
-sdwsrvl
-sdwcltm4
-#192.168.201.3
-
-[samba-server]
-ipsectest1
-
-[smbclient]
-sdwcltm2
-sdwcltm3
-ubuntu-server-1
-sdwcltm5
-sdwsrvm
-sdwcltm8
-sdwcltm6
-sdwcltm7
-sdwsrvl
-sdwcltm4
-sdwcltm9
-
-[public]
-ubuntu-server-1
-
-[snmpd]
-#192.168.201.3
-sdwcltm2
-sdwcltm3
-sdwcltm6
-sdwcltm8
-
-[netflows]
-sdwcltm2
-sdwcltm3
-sdwcltm5
-sdwcltm6
-sdwcltm7
-sdwcltm4
-sdwcltm8
-sdwcltm9
-sdwsrvm
-sdwsrvl
-ubuntu-server-1
-ubuntu-server-2
-
-[facebook]
-sdwcltm5
-sdwsrvm
-sdwcltm4
-
-[salesforce]
-sdwcltm3
-sdwcltm6
-sdwcltm7
-sdwsrvl
-sdwcltm8
-
-[youtube]
-sdwcltm2
-sdwcltm3
-
-[ftpclient]
-sdwcltm2
-sdwcltm3
-sdwcltm4
-sdwcltm5
-sdwcltm6
-sdwcltm7
-sdwcltm8
-sdwsrvm
-ubuntu-server-1
-
-[sipclient]
-sdwcltm2
-sdwcltm3
-sdwcltm4
-sdwcltm5
-sdwcltm6
-sdwcltm7
-sdwcltm8
-sdwcltm9
-sdwsrvl
-sdwsrvm
-
-[sipserver]
-ubuntu-server-2
-
-[ntopng]
-sdwcltm6
+# list all of the raspberry PI devices in the network
+# the host name on each will be set to the first column
+# it can be 1-20 characters, letters, digits, and hyphens
+wes-host1 ansible_host=127.0.0.1
+#wes-host2 ansible_host=192.168.88.240
+#wes-host3 ansible_host=192.168.88.218
+
+[ansible-hosts]
+# there must only be one ansible-host.  this is the device
+# that will act as the configuration server
+wes-host1
+
+[pi]
+# include all Raspberry Pi devces here
+wes-host1
+
+#wes-host2
+#wes-host3
+
+# use variables for passwords
+# currently not implemented
+[pi:vars]
+vncpassword=vncpass99
+pipassword=pipassword99
+
+[samba-server]
+# it is best to have only one samba-server host
+wes-host1
+
+[smbclient]
+# it would probably be best to limit this to 10 clients
+#wes-host2
+#wes-host3
+
+[public]
+# not currently used
+#
+[snmpd]
+# installs SNMP daemon
+#
+wes-host1
+
+[netflows]
+# installs flow client
+#
+[facebook]
+# devices can be set up for facebook, salesforce or youtube
+# these are mutually exclusive and must be checked by you as there
+# is no automated process for that
+wes-host1
+
+[salesforce]
+# see comment for facebook
+#wes-host2
+
+[youtube]
+# see comment for facebook
+#wes-host3
+
+[ftpclient]
+
+[sipclient]
+# generates VoIP traffic, signaling and media
+wes-host1
+#wes-host3
+
+[sipserver]
+# there must only be one sipserver
+#wes-host2
+wes-host1
+
+[ntopng]
+# hosts running ntop
+wes-host1
diff --git a/roles/ntopng/tasks/main.yaml b/roles/ntopng/tasks/main.yaml
index 6866e12..822a91b 100644
--- a/roles/ntopng/tasks/main.yaml
+++ b/roles/ntopng/tasks/main.yaml
@@ -24,6 +24,7 @@
           chdir: "{{ ansible_user_dir }}/ntopng"
 - name: install
   become: yes
+<<<<<<< HEAD
   command: "make install"
   args:
           chdir: "{{ ansible_user_dir }}/ntopng"