ch 2 mostly done