Added Goal, some interaction between classes