Initial NKJP commit

Initial NKJP commit