I forgot this was a part of the PR.  I'd like to make some changes before getting it merged.