About to convert cells to a class...
Almost there
Significant code cleanup