move timeline storage serialization in base class, fix memory class
merge