Moved Helper functions around, added Locations and LocationHelper