MFI-41 added map view and basic controlling, needs testing