implementing changes to the files based on our 10/20 meeting on class structure. I wouldn't mind it if either of you checked what I did.  I'm a bit rusty.