Adding in locations
WOrk in progress on WebUI for control