Merge Andres' Work; Finish gestures; add sound