Revert "Revert "Class""

This reverts commit 31770c335b1dcb82a7206cc6a048ceebe416a88f.