Finished initial features and wrote acceptance tests for locations
fixed last commit