Started adding role management stuff