Changed framework for OT and AS, and started work on stim pairing