Add element and species classes
Tidy up exceptions
Implement block for new class variables