Comment 15 for bug 1959010

Hey Jason, it's outside the scope of where I can spend my time, but the individual commits prior to the most recent rebase (and the tab changeover) exists in the -wip branch if you want to tackle it. I just squashed them together.