Perfect. However the connectors that you need are not fit to board - just the solder pads for them. That's not bad, it's 10 minutes work to add the connectors if you want to persue this. My question - how's your soldering?

erm, just a point - the 25W connector is missing it's shroud (steel "D" shaped form that surrounds the pins) - is that still attached to the case?