Feature/zone discovery

I beat you to it, @kestred :P
no new line at end of file