All functionality moved to the Cell class