I broke everything again, re-committing everything