Final commit before merge.  Only added a few comments