Timeline refactor

Attempted to inject the use of unique timeline objects but failed, instead brought components to stable states.