I'm breaking this out into different rows for clarity.  But I'll do this prior to my commit.