Stitch

Client feedback, stitched into code.