interrum defer changes
finish defer work
Completed rework of maps, cleared up bugs on following unit maps