I'll take a look.
Wish arc already had this, they're almost there.