Ability to sort

Closes #1 and #2