Finished design of goal related stuff