Merge WIP backbutton code into version2 branch