NWCK partial refactoring, TESTED, ACCEPTED