diff --git a/app/components/campaign/-form.js b/app/components/campaign/-form.js
index 566553d..65213f8 100644
--- a/app/components/campaign/-form.js
+++ b/app/components/campaign/-form.js
@@ -3,27 +3,16 @@ import Ember from 'ember';
 const { Component, computed, set, get } = Ember;
 
 export default Component.extend({
+
   classNames: ['card'],
 
   form: null,
 
-  serviceFieldsLoaded: false,
   serviceFields: null,
+  builtInFields: null,
 
-  builtInFields: [
-    { key: '', label: 'Select field to add...'},
-    { key: 'email', label: 'Email Address', fieldType: 'email', required: true },
-    { key: 'firstName', label: 'First Name', fieldType: 'text' },
-    { key: 'lastName', label: 'Last Name', fieldType: 'text' },
-    { key: 'companyName', label: 'Company Name', fieldType: 'text' },
-    { key: 'title', label: 'Job Title', fieldType: 'text' },
-    { key: 'country', label: 'Country', fieldType: 'select', options: [
-      { value: '', label: 'Please select...'},
-      { value: 'USA', label: 'United States' },
-      { value: 'CAN', label: 'Canada' },
-      { value: 'OTHR', label: 'Other' },
-    ]},
-  ],
+  serviceFieldsLoaded: false,
+  builtInFieldsLoaded: false,
 
   controlValue: '',
 
diff --git a/app/components/campaign/-forms.js b/app/components/campaign/-forms.js
index 7bd51f2..b3e3343 100644
--- a/app/components/campaign/-forms.js
+++ b/app/components/campaign/-forms.js
@@ -5,12 +5,21 @@ const { Component, computed, inject: { service } } = Ember;
 export default Component.extend({
   store: service(),
   demographicLoader: service(),
+  fieldLoader: service(),
 
-  serviceFields: null,
   serviceId: null,
-  serviceFieldsLoaded: false,
   forms: null,
 
+  fields: {
+    builtIn: null,
+    service: null,
+  },
+
+  loaded: {
+    builtIn: false,
+    service: false,
+  },
+
   activeForms: computed.filterBy('forms', 'active', true),
 
   hasForms: computed('activeForms.length', function() {
@@ -30,26 +39,41 @@ export default Component.extend({
     if (!this.get('forms')) {
       this.set('forms', []);
     }
-    this.set('serviceFields', []);
+    this.set('fields.builtIn', []);
+    this.set('fields.service', []);
     this.send('checkValidity');
     this.send('loadFields');
   },
 
+  loadFields(type, fields) {
+    fields.forEach(field => this.pushField(type, field));
+    this.set(`loaded.${type}`, true)
+  },
+
+  pushField(type, field) {
+    const key = `fields.${type}`;
+    this.get(key).pushObject(field);
+  },
+
   actions: {
     checkValidity() {
       this.sendAction('on-check-validity', this.get('isValid'));
     },
 
     loadFields() {
+      const placeholder = { key: '', label: 'Select field to add...'};
+
+      this.pushField('builtIn', placeholder);
+      this.get('fieldLoader').retrieve()
+        .then((fields) => this.loadFields('builtIn', fields))
+      ;
+
       if (!this.get('serviceId')) {
         return;
       }
-      this.get('serviceFields').pushObject({ key: '', label: 'Select field to add...'});
+      this.pushField('service', placeholder)
       this.get('demographicLoader').retrieve(this.get('serviceId'))
-        .then((fields) => {
-          fields.forEach((field) => this.get('serviceFields').pushObject(field));
-          this.set('serviceFieldsLoaded', true);
-        })
+        .then((fields) => this.loadFields('service', fields))
       ;
     },
     add() {
diff --git a/app/services/field-loader.js b/app/services/field-loader.js
new file mode 100644
index 0000000..e76fe7e
--- /dev/null
+++ b/app/services/field-loader.js
@@ -0,0 +1,270 @@
+import Ember from 'ember';
+
+const { Service, RSVP } = Ember;
+
+export default Service.extend({
+  fields: [
+    { key: 'email', label: 'Email Address', fieldType: 'email', required: true },
+    { key: 'firstName', label: 'First Name', fieldType: 'text' },
+    { key: 'lastName', label: 'Last Name', fieldType: 'text' },
+    { key: 'companyName', label: 'Company Name', fieldType: 'text' },
+    { key: 'title', label: 'Job Title', fieldType: 'text' },
+  ],
+
+  countryOptions: [
+    { value: '', label: 'Please select...' },
+    { value: 'USA', label: 'United States' },
+    { value: 'CAN', label: 'Canada' },
+    { value: 'AFG', label: 'Afghanistan' },
+    { value: 'ALA', label: 'Aland Islands' },
+    { value: 'ALB', label: 'Albania' },
+    { value: 'DZA', label: 'Algeria' },
+    { value: 'ASM', label: 'American Samoa' },
+    { value: 'AND', label: 'Andorra' },
+    { value: 'AGO', label: 'Angola' },
+    { value: 'AIA', label: 'Anguilla' },
+    { value: 'ATA', label: 'Antarctica' },
+    { value: 'ATG', label: 'Antigua and Barbuda' },
+    { value: 'ARG', label: 'Argentina' },
+    { value: 'ARM', label: 'Armenia' },
+    { value: 'ABW', label: 'Aruba' },
+    { value: 'ASC', label: 'Ascension Island' },
+    { value: 'AUS', label: 'Australia' },
+    { value: 'AUT', label: 'Austria' },
+    { value: 'AZE', label: 'Azerbaijan' },
+    { value: 'BHS', label: 'Bahamas' },
+    { value: 'BHR', label: 'Bahrain' },
+    { value: 'BGD', label: 'Bangladesh' },
+    { value: 'BRB', label: 'Barbados' },
+    { value: 'BLR', label: 'Belarus' },
+    { value: 'BEL', label: 'Belgium' },
+    { value: 'BLZ', label: 'Belize' },
+    { value: 'BEN', label: 'Benin' },
+    { value: 'BMU', label: 'Bermuda' },
+    { value: 'BTN', label: 'Bhutan' },
+    { value: 'BOL', label: 'Bolivia' },
+    { value: 'BIH', label: 'Bosnia and Herzegovina' },
+    { value: 'BWA', label: 'Botswana' },
+    { value: 'BVT', label: 'Bouvet Island' },
+    { value: 'BRA', label: 'Brazil' },
+    { value: 'IOT', label: 'British Indian Ocean Territory' },
+    { value: 'BRN', label: 'Brunei Darussalam' },
+    { value: 'BGR', label: 'Bulgaria' },
+    { value: 'BFA', label: 'Burkina Faso' },
+    { value: 'BDI', label: 'Burundi' },
+    { value: 'CIV', label: 'Cote dIvoire' },
+    { value: 'KHM', label: 'Cambodia' },
+    { value: 'CMR', label: 'Cameroon' },
+    { value: 'CPV', label: 'Cape Verde' },
+    { value: 'CYM', label: 'Cayman Islands' },
+    { value: 'CAF', label: 'Central African Republic' },
+    { value: 'TCD', label: 'Chad' },
+    { value: 'CHL', label: 'Chile' },
+    { value: 'CHN', label: 'China' },
+    { value: 'CXR', label: 'Christmas Island' },
+    { value: 'CCK', label: 'Cocos (Keeling) Islands' },
+    { value: 'COL', label: 'Colombia' },
+    { value: 'COM', label: 'Comoros' },
+    { value: 'COG', label: 'Congo' },
+    { value: 'COD', label: 'Congo, the Democratic Republic of the' },
+    { value: 'COK', label: 'Cook Islands' },
+    { value: 'CRI', label: 'Costa Rica' },
+    { value: 'HRV', label: 'Croatia' },
+    { value: 'CUB', label: 'Cuba' },
+    { value: 'CYP', label: 'Cyprus' },
+    { value: 'CZE', label: 'Czech Republic' },
+    { value: 'DNK', label: 'Denmark' },
+    { value: 'DJI', label: 'Djibouti' },
+    { value: 'DMA', label: 'Dominica' },
+    { value: 'DOM', label: 'Dominican Republic' },
+    { value: 'ECU', label: 'Ecuador' },
+    { value: 'EGY', label: 'Egypt' },
+    { value: 'SLV', label: 'El Salvador' },
+    { value: 'GNQ', label: 'Equatorial Guinea' },
+    { value: 'ERI', label: 'Eritrea' },
+    { value: 'EST', label: 'Estonia' },
+    { value: 'ETH', label: 'Ethiopia' },
+    { value: 'FLK', label: 'Falkland Islands (Malvinas)' },
+    { value: 'FRO', label: 'Faroe Islands' },
+    { value: 'FJI', label: 'Fiji' },
+    { value: 'FIN', label: 'Finland' },
+    { value: 'FRA', label: 'France' },
+    { value: 'FXX', label: 'France, Metropolitan' },
+    { value: 'GUF', label: 'French Guiana' },
+    { value: 'PYF', label: 'French Polynesia' },
+    { value: 'ATF', label: 'French Southern Territories' },
+    { value: 'GAB', label: 'Gabon' },
+    { value: 'GMB', label: 'Gambia' },
+    { value: 'GEO', label: 'Georgia' },
+    { value: 'DEU', label: 'Germany' },
+    { value: 'GHA', label: 'Ghana' },
+    { value: 'GIB', label: 'Gibraltar' },
+    { value: 'GRC', label: 'Greece' },
+    { value: 'GRL', label: 'Greenland' },
+    { value: 'GRD', label: 'Grenada' },
+    { value: 'GLP', label: 'Guadeloupe' },
+    { value: 'GUM', label: 'Guam' },
+    { value: 'GTM', label: 'Guatemala' },
+    { value: 'GGY', label: 'Guernsey' },
+    { value: 'GIN', label: 'Guinea' },
+    { value: 'GNB', label: 'Guinea-Bissau' },
+    { value: 'GUY', label: 'Guyana' },
+    { value: 'HTI', label: 'Haiti' },
+    { value: 'HMD', label: 'Heard Island and McDonald Islands' },
+    { value: 'VAT', label: 'Holy See (Vatican City State)' },
+    { value: 'HND', label: 'Honduras' },
+    { value: 'HKG', label: 'Hong Kong' },
+    { value: 'HUN', label: 'Hungary' },
+    { value: 'ISL', label: 'Iceland' },
+    { value: 'IND', label: 'India' },
+    { value: 'IDN', label: 'Indonesia' },
+    { value: 'IRN', label: 'Iran' },
+    { value: 'IRQ', label: 'Iraq' },
+    { value: 'IRL', label: 'Ireland' },
+    { value: 'IMN', label: 'Isle of Man' },
+    { value: 'ISR', label: 'Israel' },
+    { value: 'ITA', label: 'Italy' },
+    { value: 'JAM', label: 'Jamaica' },
+    { value: 'JPN', label: 'Japan' },
+    { value: 'JEY', label: 'Jersey' },
+    { value: 'JOR', label: 'Jordan' },
+    { value: 'KAZ', label: 'Kazakhstan' },
+    { value: 'KEN', label: 'Kenya' },
+    { value: 'KIR', label: 'Kiribati' },
+    { value: 'PRK', label: 'Korea, Democratic Peoples Republic of' },
+    { value: 'KOR', label: 'Korea, Republic of' },
+    { value: 'KWT', label: 'Kuwait' },
+    { value: 'KGZ', label: 'Kyrgyzstan' },
+    { value: 'LAO', label: 'Lao Peoples Democratic Republic' },
+    { value: 'LVA', label: 'Latvia' },
+    { value: 'LBN', label: 'Lebanon' },
+    { value: 'LSO', label: 'Lesotho' },
+    { value: 'LBR', label: 'Liberia' },
+    { value: 'LBY', label: 'Libyan Arab Jamahiriya' },
+    { value: 'LIE', label: 'Liechtenstein' },
+    { value: 'LTU', label: 'Lithuania' },
+    { value: 'LUX', label: 'Luxembourg' },
+    { value: 'MAC', label: 'Macao' },
+    { value: 'MKD', label: 'Macedonia, the former Yugoslav Republic of' },
+    { value: 'MDG', label: 'Madagascar' },
+    { value: 'MWI', label: 'Malawi' },
+    { value: 'MYS', label: 'Malaysia' },
+    { value: 'MDV', label: 'Maldives' },
+    { value: 'MLI', label: 'Mali' },
+    { value: 'MLT', label: 'Malta' },
+    { value: 'MHL', label: 'Marshall Islands' },
+    { value: 'MTQ', label: 'Martinique' },
+    { value: 'MRT', label: 'Mauritania' },
+    { value: 'MUS', label: 'Mauritius' },
+    { value: 'MYT', label: 'Mayotte' },
+    { value: 'MEX', label: 'Mexico' },
+    { value: 'FSM', label: 'Micronesia, Federated States of' },
+    { value: 'MDA', label: 'Moldova, Republic of' },
+    { value: 'MCO', label: 'Monaco' },
+    { value: 'MNG', label: 'Mongolia' },
+    { value: 'MNE', label: 'Montenegro' },
+    { value: 'MSR', label: 'Montserrat' },
+    { value: 'MAR', label: 'Morocco' },
+    { value: 'MOZ', label: 'Mozambique' },
+    { value: 'MMR', label: 'Myanmar' },
+    { value: 'NAM', label: 'Namibia' },
+    { value: 'NRU', label: 'Nauru' },
+    { value: 'NPL', label: 'Nepal' },
+    { value: 'NLD', label: 'Netherlands' },
+    { value: 'ANT', label: 'Netherlands Antilles' },
+    { value: 'NCL', label: 'New Caledonia' },
+    { value: 'NZL', label: 'New Zealand' },
+    { value: 'NIC', label: 'Nicaragua' },
+    { value: 'NER', label: 'Niger' },
+    { value: 'NGA', label: 'Nigeria' },
+    { value: 'NIU', label: 'Niue' },
+    { value: 'NFK', label: 'Norfolk Island' },
+    { value: 'MNP', label: 'Northern Mariana Islands' },
+    { value: 'NOR', label: 'Norway' },
+    { value: 'OMN', label: 'Oman' },
+    { value: 'PAK', label: 'Pakistan' },
+    { value: 'PLW', label: 'Palau' },
+    { value: 'PSE', label: 'Palestinian Territory, Occupied' },
+    { value: 'PAN', label: 'Panama' },
+    { value: 'PNG', label: 'Papua New Guinea' },
+    { value: 'PRY', label: 'Paraguay' },
+    { value: 'PER', label: 'Peru' },
+    { value: 'PHL', label: 'Philippines' },
+    { value: 'PCN', label: 'Pitcairn' },
+    { value: 'POL', label: 'Poland' },
+    { value: 'PRT', label: 'Portugal' },
+    { value: 'PRI', label: 'Puerto Rico' },
+    { value: 'QAT', label: 'Qatar' },
+    { value: 'REU', label: 'Reunion' },
+    { value: 'ROU', label: 'Romania' },
+    { value: 'RUS', label: 'Russian Federation' },
+    { value: 'RWA', label: 'Rwanda' },
+    { value: 'SHN', label: 'Saint Helena' },
+    { value: 'KNA', label: 'Saint Kitts and Nevis' },
+    { value: 'LCA', label: 'Saint Lucia' },
+    { value: 'MAF', label: 'Saint Martin' },
+    { value: 'SPM', label: 'Saint Pierre and Miquelon' },
+    { value: 'VCT', label: 'Saint Vincent and the Grenadines' },
+    { value: 'WSM', label: 'Samoa' },
+    { value: 'SMR', label: 'San Marino' },
+    { value: 'STP', label: 'Sao Tome and Principe' },
+    { value: 'SAU', label: 'Saudi Arabia' },
+    { value: 'SEN', label: 'Senegal' },
+    { value: 'SRB', label: 'Serbia' },
+    { value: 'SYC', label: 'Seychelles' },
+    { value: 'SLE', label: 'Sierra Leone' },
+    { value: 'SGP', label: 'Singapore' },
+    { value: 'SVK', label: 'Slovakia' },
+    { value: 'SVN', label: 'Slovenia' },
+    { value: 'SLB', label: 'Solomon Islands' },
+    { value: 'SOM', label: 'Somalia' },
+    { value: 'ZAF', label: 'South Africa' },
+    { value: 'SGS', label: 'South Georgia and the South Sandwich Islands' },
+    { value: 'ESP', label: 'Spain' },
+    { value: 'LKA', label: 'Sri Lanka' },
+    { value: 'SDN', label: 'Sudan' },
+    { value: 'SUR', label: 'Suriname' },
+    { value: 'SJM', label: 'Svalbard and Jan Mayen' },
+    { value: 'SWZ', label: 'Swaziland' },
+    { value: 'SWE', label: 'Sweden' },
+    { value: 'CHE', label: 'Switzerland' },
+    { value: 'SYR', label: 'Syrian Arab Republic' },
+    { value: 'TWN', label: 'Taiwan' },
+    { value: 'TJK', label: 'Tajikistan' },
+    { value: 'TZA', label: 'Tanzania, United Republic of' },
+    { value: 'THA', label: 'Thailand' },
+    { value: 'TLS', label: 'Timor-Leste' },
+    { value: 'TGO', label: 'Togo' },
+    { value: 'TKL', label: 'Tokelau' },
+    { value: 'TON', label: 'Tonga' },
+    { value: 'TTO', label: 'Trinidad and Tobago' },
+    { value: 'TUN', label: 'Tunisia' },
+    { value: 'TUR', label: 'Turkey' },
+    { value: 'TKM', label: 'Turkmenistan' },
+    { value: 'TCA', label: 'Turks and Caicos Islands' },
+    { value: 'TUV', label: 'Tuvalu' },
+    { value: 'UGA', label: 'Uganda' },
+    { value: 'UKR', label: 'Ukraine' },
+    { value: 'ARE', label: 'United Arab Emirates' },
+    { value: 'GBR', label: 'United Kingdom' },
+    { value: 'UMI', label: 'United States Minor Outlying Islands' },
+    { value: 'URY', label: 'Uruguay' },
+    { value: 'UZB', label: 'Uzbekistan' },
+    { value: 'VUT', label: 'Vanuatu' },
+    { value: 'VEN', label: 'Venezuela' },
+    { value: 'VNM', label: 'Viet Nam' },
+    { value: 'VGB', label: 'Virgin Islands, British' },
+    { value: 'VIR', label: 'Virgin Islands, U.S.' },
+    { value: 'WLF', label: 'Wallis and Futuna' },
+    { value: 'ESH', label: 'Western Sahara' },
+    { value: 'YEM', label: 'Yemen' },
+    { value: 'ZMB', label: 'Zambia' },
+    { value: 'ZWE', label: 'Zimbabwe' },
+  ],
+
+  retrieve() {
+    const fields = this.get('fields');
+    fields.pushObject({ key: 'country', label: 'Country', fieldType: 'select', options: this.get('countryOptions') });
+    return RSVP.resolve(fields);
+  },
+});
diff --git a/app/templates/components/campaign/-forms.hbs b/app/templates/components/campaign/-forms.hbs
index 569f3f4..e4b30da 100644
--- a/app/templates/components/campaign/-forms.hbs
+++ b/app/templates/components/campaign/-forms.hbs
@@ -7,8 +7,10 @@
       {{campaign/-form
         index=index
         class="mb-4"
-        serviceFields=serviceFields
-        serviceFieldsLoaded=serviceFieldsLoaded
+        serviceFields=fields.service
+        serviceFieldsLoaded=loaded.service
+        builtInFields=fields.builtIn
+        builtInFieldsLoaded=loaded.builtIn
         form=form
         on-destroy=(action "remove")
         on-change=(action "checkValidity")