More simplification. Made timezones work. Refactoring.