BEF Merge

Master branch was ahead of the BEF. This commit is trying to get everything from the BEF onto master real quick,