Refactored Location out into its own class.