Almost workable Cell class + some fixes