initial type rework to move away from timezone issues