Experimental TZ support - Do not merge yet

Preliminary TZ support code