I agree with your last sentence. It is a small piece of code, and it would only be for abstraction. I think (as mentioned in my previous comment) this is a nice starting point for 2.0. We had a guy work on 2.0 already but @iwalz hasn't provided me with an updated for a long time.