Started to redo timeline builder