Merged my work with @philpci

Still needs to add and commit geofences to database.