Add nwm target
Fixes from testing