More work on adding extra fields where they need to go.