in progress
Added some time zone stuff. Not tested.