working on roles...

roles, and then some.