more progress towards getting timezones working