Generating infill now (mostly)