Lab 3 Fixup -- Implemented Wavefront and MapGUI