Port all relevant functionality from tz-0.0.0.4