Finish rig_arm

The final commit