MapController almost finished