Better class switcher & give every stream a default end time.