fakeout, refactor wasnt complete -- now is.
Merge pull request #33 from mpint/newb

fakeout, refactor wasnt complete -- now is.