Commiting as about to remove surface
Another commit as I'm about to scrap cells...I dont know what they are for.
Cells is gone from surface. Would like to see if I can remove all but display-surface.