Major Refactoring and NFC 100% functional.