Recommitting Chris's changes (some modified) after project reset