Working through the whole not-working thing.
Lots of changes from Peter to make things sort-of work.