main code done
tests passed!
Merge pc20.cpp