pc 17 and 18 done
Merge pc17.cpp