Ported over to modular system
Merge pull request #1 from chuck211991/master

Ported over to modular system