Fixed up timeline bugs, but it's pretty messy. Needs to be refactored