first stab at adding extra fields, no i18n yet