mostly done with 1.1