Initial ND2 commit

Basic structure