v2

Lots and lots of changes :))