[wip] patch: Test pass but very dirty.