Almost-works-commit