Rando partially working, just need to scrub the request message a bit