bunch of changes.
Merge pull request #6 from zimmerst/integration

bunch of changes.