Map now regenerates without crashing.  OpenGL code commented out until context working.