Initial 3.1 upgrade work - enough to at least run, still need to fix several other things