Refactored Roles and dataService to include add/find/remove/update

Kinda fantastic, much DRY-er