Moving to 3.5 compatibility

It's a rough road ahead.