Sorted

I've been a bit behind for the past few days but now I've got it all organized.