Timeline refactor.