Use new Random module

Use randrange from our Random module rather than builtin random module