Giant debug commit from Wednesday