WIP: Finish port of Map, open issues remain