First working version of goals