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

Ported over to modular system
Forgot to remove pip-freeze and update things
Merge pull request #2 from chuck211991/master

Forgot to remove pip-freeze and update things