Added most of endDate stuff