Added comments

Hey -- the code looks great overall.  I added a few TODO's with some suggestions about how to restructure a few things.