Done with 1.1 (hopefully)