added todo's, completed tests for subsampling approach