take out the comparator stuff from bundle directly for now