Should we combine these steps somehow?  Not exactly sure what that'd look like, but I find it a little confusing at present.  I don't feel super strongly though, so LGTM if you'd rather keep moving.