Fresh eyes find bugs... derp