3.2 unfinished

First build of 3.2 to be finished later