Beginnings of work on 3.5