Initial Timeline refactor changes (nonfunctional)