Lots of sorting additions