Step 1 of Sean's suggestions

Oh my god, we have to re-write half of this thing again.