Working on refactoring the cell class.