Refactored a bit but doesn't fix anything
Merge branch 'master' of https://github.com/cmhouston/excl-mobile