" the correct pin mapping from hardware/arduino/variants/leonardo/pins_arduino.h"
Hmm, hope I was not far off!
I actually let it autoroute, tweaked placement a little and autoroute again, then moved traces to let missing grounds connect up.
Will see how for off I was when I get home ...