Moving over a variety of changes
Fixing problem with .class files
Still working on class files