(experimental) new timeline almost done