Fewer rest calls, more randomization

If this is a constant it probably shouldn't live on the collection