Used y_cell more.  Fixed a recursive include problem.