FInish map feature

Map works well