7/31/2013:17:12 - Quad complete

Tested working, test framework still in map.cpp