add draft 2 mostly done