Completed ZAS rework.  Needs testing, and consideration to make zones sleep.