WIP: Working sort order!