Care to submit another PR and a few tests?