Added the TODO lists
Documented the exceptions