Added new class
New class
Merge branch 'testing'