Part 3 of fixing major derp.