Here's challenge 7
Makefile
Merge pc7 and previous fixes