Pull @robdirienzo's initial work on timeline feature