Refactor to simplfy
Merge pull request #32 from sudosuu/master

Initial changes to make the app build & run