HUGE Update for v3.5 (incomplete!)
Things are very likely to be broken, not fully tested yet.