More noodling with underscore fixes. This is terrible