Class
Revert "Class"

This reverts commit d663b5e6683c21f6336cbd9824af3c93e70e79fb.
Revert "Revert "Class""

This reverts commit 88a90e5d9e0ebf0b6f4e08fca4a6a6d4158b96d6.