Manually merged in the general and BCH version of the code (for the most part) and configured the new features