I was having some problems with the snapping (finding snaps where .001 mis-aligned. I must of been having a bad day).

Anyway, started again:-