Move i to local
Add cell content and cell mover