Increase timelines awesomeness.
Merge pull request #682 from opf/feature/awesome-timelines

Increase timelines awesomeness.