First version breaking from reliance on full code
Fix a few bugs, and remove nitrogen static