major refacture of timeline, not working yet though!