Started work getting locations from the system.  Also fixed the Map so that it actually loads now.