Inital commit for CBN