Finished temporal refactoring...for now