v2.0

added loads of things