[WIP] ENB + BH

Not ready yet! Work in progress!