Began work towards more robust sort options