tried to revert to an old commit but things are still messed up. I'll get back to it tomorrow