Added stuff for Part 5, but still not working 100%.