Lots o' Updates to classes
More Stuff