add in shuffle support, prelim prevention of sql injection