Bunch of commits to get 1st and 3rd exercises working