Step 2 of Complete Refractor

Got it so the map generates successfully now using my shnazzy new
modular approach.