Update2-Commit

Updated classes, ready to release.