More clean up.
Got basic Zone drawing in place.