Added remaining mapping, geocoding, etc. and the new objective controller.