Feature/zone discovery

I beat you to it, @kestred :P