Actually re-rolling ones, in batches, instead of starting at 2. Closes #1