Try pulling my commits for the stitch feature. We'll have a fair bit of diverging code.