Almost there. Latest version that works in this commit.