it's going to be refactoring quite a bit, and having the subclassing actually exist upstream means we can make sure we don't break you