[WIP] Restricted zones, fixes #624