adding a buncha stuff
Merge branch 'develop'