Fix map to update when your location changes
Extract MarkersController to a separate file
Extract FindMatchController to a separate file