Added zone detection. Hack-ish for now until server passes the zones in ...

Added zone detection. Hack-ish for now until server passes the zones in proper order.