added everything
Merge pull request #2 from moxdev/controller

added everything