NLSML support

Not ready to merge, discussion only