Started on lesson 16. Still need to finish 15.
 Fixed merge issues