Debug button, yet more reorganizing