This an a couple of the other commits above may have been a rebase faux pas.  I'm going to review fix this as well as review the changes again.