Rework: One Leg and Tests