start removing Cells and move that stuff to Cell. less confusion.
File clean up