Refactor: move all args to cell rather than x, y