Part 4 and hopefully last of fixing the major derp I made.