merged working experiment with ember back into map view