Remove Todos and add Roles - #1
Merge pull request #24 from churchio/updates

Remove Todos (#1) and add roles