Feature/timeline bundle