Made changes so that lots of sampling was possible. Negative results on first trial, but hopefully just a minor bug