* Finished adding location
* Refactoring