a bunch of changes
Merge pull request #1 from zimmerst/integration

a bunch of changes