NFM Addition #002

* Added NFM stuff
Addition #002