last commit before leaving class, everything looks good so far.  tightening up everything before the merge tomorrow