migrating functionality into the Cell Class