Working on getting the endpoint right for calendar years