Nws

Ready to merge NWS into trunk.