Adding my first/last checks on the timeline events back into the logic