WIP: more timeline refactoring