Playing by the rules now. Inheriting from the base class

Signed-off-by: Dominic Cronin <dominic.cronin@gmail.com>
Merge branch 'master' of https://github.com/DominicCronin/T-cubed