Almost working, bug in NW
All working now