passes nearly every test
Merge pull request #1 from branwall/class-rewrite

passes nearly every test