Almost done temporal refactoring