Final commit

Added the 2 cell types.