Fourth commit. Essentially complete.