Added missing structures, added some zone support. Doesn't work yet (zone that is)