How to: simple motor connection (real post this time)

I added some labels to the diagram. Here are my guesses as to what solders to what for 1-7:

1. Non-band side of diode - not sure where this goes
   
2. Band side of diode - solder to the positive side of the motor (3)
   
3. Wire to the positive side of the main 3.7v power source. You mention another diode tho?
   
4. Use wire to connect to any pin in "General purpose IO Pin" section here: http://www.espruino.com/EspruinoBoard
   
5. Drain - connect to 7
   
6. Source - use a wire to connect to the board's "GND" terminal.
   
7. Negative side of motor - connect to 5 (drain)
   
   

Except for #1, does that look right?