1st step towards decoupling roles