WIP commit of lead-to-entry wiring up