Reworked it so that the primitives were also a list of cells.