Got most of it working - need to do random components