Refactored locations. Initial commit before merging into master.