add new stuff
Merge branch 'addingstuff'