almost done with 1.1