Merge pull request #54 from avasquez614/master

Working on API refactoring and permission handling.