Just one massive updated to fix imports, NfN export, and refactored code.