Got a start on the map builder and some clarity updates to the rest of the code