Do not merge yet

This is mostly just a pull to keep reference of the differences between master and BEF. I made a new branch BEF-staging so we can test it without new commits being added and messing things up.