Reverting everything. I can't figure it out (and I should have worked
in a branch)