Partial commit.  I'm comin' in to the CIT to continue working...