Committing work done on chapter 12 and 13 stuff