Add Cell-Class 
Add Unit-Tests