Fewer rest calls, more randomization

Sometimes gets scary stuff...