Yep, it was easy to refactor to this once we weren't subclassing anymore.