Refactored out the timeline into a seperate class