Updating for Roles [initial stubby commit]