adds loads of stuff
moar changes