Tidy and add

Tidied up some classes and added some new bits