Finished Chapter 22 some TODOs remain to be fixed
Finished Chapter 22 some TODOs still need to be fixed