Expand the timeline WIP /cc @phamann