Modularize stitching.
WIP Commit
WIP commit