wip
Add some initial NNF stuff