Work on map feature
Fix #1 (implement map)