prob 2 mostly done