cleaned up role additions and switched to rb format