Added handling of all of the types of cells.