WIP: cellnav + edit almost working