Added support for random feature.  Still unstable!