final?

I could only get this much of it to actually work; I am unsure of how to
proceed from here, so I'm getting this work pushed in case I can't get
any further.
Revert "final?"

This reverts commit 1b8836bf00f070ac79ac2089bbb33f3296d735ba.