added some zone drafts, also refactored some stuff