Cp-10

Added features of sorting and deleting (though not really deleting). 
Probably fine to leave it actually, that happens when I ask eclipse to clean up the code too (but then I changed all the lines).
Perhaps we can do a code formatting cleanup at the end? :) (because I have a feeling people are going to commit code with different styles anyway...)