Bobs stuff

merging bobsStuff branch into master