Starting to add support for timeline in the poc.