More working-ish using UIDs instead of names...