Cell Decomposition work, cannot test until merge with Matthew