Torque and Comp added -- just needs testing