Version 3

I broke loads of things. Need to revert!!