Commit of all stuff done to date, change emphasis