First commit of the BHAM branch