completed the last of the nl stuff / refactoring in the delivery