done with 1, and most of 2