Realised Zone's constructor isn't pretty much done and there was an oversight. Instead of reducing the amount of TODOs, I increased it.