Refactored location stuff out to a separate class