Start refactoring maps into its own controller