Added Goal Class
another merge