Revert "Revert "Class""

This reverts commit 9859464990269ce9a3f2345c843d1439138266d2.