Work on moving roles model to roles and permissions