Yes, let's do the former for this pull and then do the latter on a follow up pull. Thanks!