Added more sorting. Getting better.