Sorted out Step 2

I had steps 2 and 4 overly entangled.  This commit clearly breaks out
step 2.