Bullshit, need to revert a couple of commits