2 part almost done

2 part almost done