Move nextSquare into nextBuilder