FIXED THE SORTING! HOORAY