Still seeing two exceptions, but have nailed the rest. Finish on Monday.