Added NIM Functionality
Merge branch 'master' of github.com:okostiva/csci400