Closed #2 adding goals