Began adapting old `cells` work.