Move stitching to seperate class