5/30 Class Commit