It does simplify things a bit. Moved it to the based class.