current map_handler now in place
Merge branch 'idmerge2' of https://github.com/aarontitus/crisiscleanup into idmerge2