First steps toward subsampling. Need to test still.
Fix subsampling
Merge branch 'subsample'