Some new things some old things, timeline keys get calculated correclty (Maybe)