Merging Ben's latest changes

This will likely require some changes to merge