Kearny's branch here
Add map basics