#18 Adding timeline view