added new stuff
Merge branch 'janieblue-new_stuff'