I'm happy to add that logic after this is merged in.