More Path Problems

Initial fix I used to fix the path issues for Lab 3 now doesn't work for
Lab 4. All Lab four code is present here - will attempt fix after
commit.