Made more progress on Time and TimeSlot