Merged timeline work into modules work.