Got the current and goal dates working