Merge pull request #1 from nextlanding/production

moved extensions over
Merge pull request #2 from nextlanding/production

fix circular dependency
Merge pull request #3 from nextlanding/qa

Qa