Change the timing of loading of additional timelines and add a todo marker, as this is only a band aid for the moment.