Added some more bits
Lots of new stuff