Add |Dynamic| |Definitions|

What could possibly go wrong
Merge pull request #1 from Morphan1/master

Update NMS stuff