First cut of updated map drawing; need to re-do piece drawing.
Merge remote-tracking branch 'origin/realmdefence' into realmdefence