Moved goal constructor to separate controller