Complete: Leg one and tests (fixed)