Revert "Revert "Adding Classes""

This reverts commit 290553011d35e4709d4147e8f99aba134ebd28fd.