More Map Maker things. Clsoes #150.