Add bobmayo56

Add stuff from my branch, plz!