Remove timeline models (TODO extend new ones)
Avoid conflicts inside function closure
Start adding stuff to timeline model