Merge pull request #1 from GrumpyNounours/master

testing
added some classes
adding Wesley's class structures