weeks2-3

(This had to be copied into Windows user directory first. I'll try
unlinking and re-linking after this commit.)