I've edited my CS to use the new format, I think I've got it sorted.  Tell me if there's any new problems.