wip, clean up
add timezone support
merge in tzone support