more fixing of roles and required methods and such