Finish adding all the goals
Work on lesson 6 and add templates