Got unit roles working