map pretty much ready to go
merge