More refactor
Prepping for multiple timelines