Sometimes inheritance isn't all that bad...
Making progress....
Adding more tests...