Added GoalService and GoalDao. Also some minor adaptions and changes.