Further work on the core classes
Added some more stuff