Fixed up cell replacements
Added a generic CellBuilder for making one-off cells