2 0 wip

So this is what I had to do to get 2-0-stable working I'd recommend making this part of the master branch and then making 2-0-stabel branch for us devs lagging behind...