Made fixes for iProject2, then started getting carried away with memory for iProject3.  Committing at weird point.