adds timeline, scrubs models
bugfixes