This is the main addition for this issue.  The rest is just clean up