Snapshot 3.5

New stuff