implement better handling of cell handling and selection/deselection