Delegate, don't inherit
simplify things
Simplifying, adding tests