Added comments and defined TODOs

Removed unused/practice code to prepare for PR.  I added TODO's with
what my intent is to provide better exception messages during failure at
runtime.