Location / Minor Refactoring

New Features:

- Location
- Location Name