Broken quite a few things but needed to tidy up and extend base classes
Merge branch 'master' of https://github.com/rkenning/CatTNT.git
A new start