Fixed flow in CellDriver.cpp, but we have more changes about to need merging...
Merged changes with CellDriver.cpp and blah... Compiles.