Now pointing to 3.5

Everything builds and runs (tests included).