Yes, and sorting in general definitely needs some refactoring love from @sigurdteigen