blah
bBaum changes
disgusting merge