Started refactoring core temporal functions