ZAS overhaul
Merge pull request #64 from ZomgPonies/master

ZAS overhaul