WIP working on timeline
Resolved conflicts after merging in timeline-wip