Correct sorting. Closing out #13