Enter coordinates of location into database as opposed to name of location
Incorporate new schema into queries
fixed merge issue