Update Ben's tree

update Ben's tree to match the current master