Cell Class Re-work

Re-work of the Cell class and spec. Now includes indicator method.