#1407: implement cellClass logic