Moved location service into its own class.