Feature/stitch

This should have all updates as of Oct 21st 2013.