Last commit before going to generator for maps
First working version of generator maps