1 and 2 nearly complete