fixed derped up merge from partition_on_abundance, properly 3 way merged that branch along with master