Other than that (small) change, I don't see any differences in logic versus what we'd discussed earlier...looks good to me...+1 for a merge