(Untested) Couple major improvements: (1) Add 'holding' to gripper state and integrate this. (2) Make movement while holding objects maintain orientation.