Started working on zones and a bunch of other stuff