Revert "Broken quite a few things but needed to tidy up and extend base classes"

This reverts commit 41745f78878bd55564d24a4b18f002e90630b17a.