finished with timezone refactoring for now