Advance Locations and Contacts

Added functionality for contacts and very minimal functionality for
locations