Revert "Add Class"

This reverts commit 3e79c9c3f5e30a6c6334c0ebc69c762a0561d525.
Revert "Revert "Add Class""

This reverts commit 359ea2f19f19b48d69a5be82526360a9ef22e163.