Sort

Sorted it (because I'm like that), and added a bunch of new stuff which will be more apparent in the second commit.