updates

stuff
testing
updates
updates
Merge branch 'sbaker' into delliott