[WIP] Added zones