moved stuff into roles