diff --git a/assets/scripts/dist/bundle.js b/assets/scripts/dist/bundle.js
index 398fb57..205ec52 100644
--- a/assets/scripts/dist/bundle.js
+++ b/assets/scripts/dist/bundle.js
@@ -1 +1 @@
-!function(e){function t(i){if(n[i])return n[i].exports;var o=n[i]={exports:{},id:i,loaded:!1};return e[i].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="/assets/scripts/dist/",t(0)}([function(e,t,n){e.exports=n(1)},function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0}),t.Choices=void 0;var o=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),s=n(2),a=t.Choices=function(){function e(t){i(this,e);var n=document.createElement("FAKE_ELement"),o=t||{},s={element:document.querySelector("[data-choice]"),disabled:!1,create:!0,maxItems:!1,delimiter:",",allowDuplicates:!0,debug:!1,placeholder:!1,callbackOnInit:function(){},callbackOnRender:function(){},callbackOnKeyUp:function(){},callbackOnKeyDown:function(){},callbackOnEntry:function(){},callbackOnRemove:function(){}};this.options=this.extend(s,o||{}),this.initialised=!1,this.supports="querySelector"in document&&"addEventListener"in document&&"classList"in n,this.element=this.options.element,this.valueArray=""!==this.element.value?this.cleanInputValue(this.element.value):[],this.valueCount=this.valueArray.length,this.onClick=this.onClick.bind(this),this.onKeyDown=this.onKeyDown.bind(this),this.onChange=this.onChange.bind(this),this.onFocus=this.onFocus.bind(this),this.onBlur=this.onChange.bind(this),this.init()}return o(e,[{key:"cleanInputValue",value:function(e){return e.replace(/\s/g,"").split(this.options.delimiter)}},{key:"extend",value:function(){for(var e={},t=arguments.length,n=function(t){for(var n in t)e[n]=t[n]},i=0;t>i;i++){var o=arguments[i];(0,s.isType)("Object",o)?n(o):console.error("Custom options must be an object")}return e}},{key:"isOpen",value:function(){}},{key:"isDisabled",value:function(){}},{key:"isEmpty",value:function(){return 0===this.valueCount.length}},{key:"clearInput",value:function(){this.input.value&&(this.input.value="")}},{key:"onKeyUp",value:function(e){}},{key:"onKeyDown",value:function(e){var t=this,n=e.ctrlKey||e.metaKey;if(n&&65===e.keyCode)for(var i=0;i<this.list.children.length;i++){var o=this.list.children[i];o.classList.add("is-selected")}if(13===e.keyCode&&e.target.value&&!function(){var e=t.input.value,n=function(){var n=!0;t.options.maxItems&&t.options.maxItems<=t.list.children.length&&(n=!1),t.options.allowDuplicates===!1&&t.element.value&&t.valueArray.indexOf(e)>-1&&(n=!1),n&&(t.addItem(e),t.updateInputValue(e),t.clearInput(t.element))};n()}(),(8===e.keyCode||46===e.keyCode)&&!e.target.value){var s=function(){var e=t.list.querySelectorAll(".choices__item"),n=e[e.length-1];n.classList.add("is-selected");for(var i=0;i<e.length;i++){var o=e[i];o.classList.contains("is-selected")&&(t.removeItem(o),t.removeInputValue(o.textContent))}};s(),e.preventDefault()}}},{key:"onFocus",value:function(e){}},{key:"onClick",value:function(e){}},{key:"onChange",value:function(e){}},{key:"addEventListeners",value:function(e){e.addEventListener("click",this.onClick),e.addEventListener("keyup",this.onKeyUp),e.addEventListener("keydown",this.onKeyDown),e.addEventListener("change",this.onChange),e.addEventListener("focus",this.onFocus),e.addEventListener("blur",this.onBlur)}},{key:"removeEventListeners",value:function(e){e.removeEventListener("click",this.onClick),e.removeEventListener("keyup",this.onKeyUp),e.removeEventListener("keydown",this.onKeyDown),e.removeEventListener("change",this.onChange),e.removeEventListener("focus",this.onFocus),e.removeEventListener("blur",this.onBlur)}},{key:"setPlaceholder",value:function(){}},{key:"setValue",value:function(){}},{key:"getValue",value:function(){}},{key:"getPlaceholder",value:function(){}},{key:"search",value:function(){}},{key:"updateInputValue",value:function(e){this.options.debug&&console.debug("Update input value"),this.valueArray.push(e),this.element.value=this.valueArray.join(this.options.delimiter),console.log(this.element.value)}},{key:"removeInputValue",value:function(e){this.options.debug&&console.debug("Remove input value");var t=this.valueArray.indexOf(e);this.valueArray.splice(t,1),this.element.value=this.valueArray.join(this.options.delimiter)}},{key:"addItem",value:function(e){this.options.debug&&console.debug("Add item");var t=document.createElement("li");t.classList.add("choices__item"),t.textContent=e,this.list.appendChild(t)}},{key:"removeItem",value:function(e){e&&e.parentNode.removeChild(e)}},{key:"init",value:function(){this.supports||console.error("Your browser doesn'nt support shit"),this.initialised=!0,this.render(this.element)}},{key:"renderTextInput",value:function(){var e=this,t=document.createElement("div");t.className="choices choices--active";var n=document.createElement("div");n.className="choices__inner",this.element.classList.add("choices__input","choices__input--hidden"),this.element.tabIndex="-1",this.element.setAttribute("style","display:none;"),this.element.setAttribute("aria-hidden","true"),(0,s.wrap)(this.element,n),(0,s.wrap)(n,t);var i=document.createElement("ul");i.className="choices__list";var o=document.createElement("input");o.type="text",o.className="choices__input choices__input--cloned",o.placeholder&&(o.placeholder=this.element.placeholder),n.appendChild(i),n.appendChild(o),t.appendChild(n),this.containerOuter=t,this.containerInner=n,this.input=o,this.list=i,""!==this.element.value&&this.valueArray.forEach(function(t){e.addItem(t)}),this.addEventListeners(this.input)}},{key:"renderSelectInput",value:function(){}},{key:"render",value:function(){switch(this.options.debug&&console.debug("Render"),this.element.type){case"text":this.renderTextInput();break;case"select-one":this.renderSelectInput();break;case"select-multiple":console.warn("Choices does not support multiple select boxes");break;default:rthis.renderTextInput()}}},{key:"destroy",value:function(){this.options=null,this.element=null,this.initialised=null,this.removeEventListeners(this.input)}}]),e}();!function(){var e=document.getElementById(1),t=document.getElementById(2),n=document.getElementById(3);new a({element:e,delimiter:" ",maxItems:5}),new a({element:t,allowDuplicates:!1}),new a({element:n})}()},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=(t.hasClass=function(e,t){return new RegExp(" "+t+" ").test(" "+e.className+" ")},t.capitalise=function(e){return e.replace(/\w\S*/g,function(e){return e.charAt(0).toUpperCase()+e.substr(1).toLowerCase()})},t.isType=function(e,t){var n=Object.prototype.toString.call(t).slice(8,-1);return void 0!==t&&null!==t&&n===e},t.whichTransitionEvent=function(){var e,t=document.createElement("fakeelement"),n={transition:"transitionend",OTransition:"oTransitionEnd",MozTransition:"transitionend",WebkitTransition:"webkitTransitionEnd"};for(e in n)if(void 0!==t.style[e])return n[e]},t.whichAnimationEvent=function(){var e,t=document.createElement("fakeelement"),n={animation:"animationend",OAnimation:"oAnimationEnd",MozAnimation:"animationend",WebkitAnimation:"webkitAnimationEnd"};for(e in n)if(void 0!==t.style[e])return n[e]});t.getParentsUntil=function(e,t,n){for(var i=[];e&&e!==document;e=e.parentNode){if(t){var o=t.charAt(0);if("."===o&&e.classList.contains(t.substr(1)))break;if("#"===o&&e.id===t.substr(1))break;if("["===o&&e.hasAttribute(t.substr(1,t.length-1)))break;if(e.tagName.toLowerCase()===t)break}if(n){var s=n.charAt(0);"."===s&&e.classList.contains(n.substr(1))&&i.push(e),"#"===s&&e.id===n.substr(1)&&i.push(e),"["===s&&e.hasAttribute(n.substr(1,n.length-1))&&i.push(e),e.tagName.toLowerCase()===n&&i.push(e)}else i.push(e)}return 0===i.length?null:i},t.wrap=function(e,t){return t=t||document.createElement("div"),e.nextSibling?e.parentNode.insertBefore(t,e.nextSibling):e.parentNode.appendChild(t),t.appendChild(e)},t.getSiblings=function(e){for(var t=[],n=e.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==e&&t.push(n);return t},t.findAncestor=function(e,t){for(;(e=e.parentElement)&&!e.classList.contains(t););return e},t.debounce=function(e,t,n){var i;return function(){var o=this,s=arguments,a=function(){i=null,n||e.apply(o,s)},r=n&&!i;clearTimeout(i),i=setTimeout(a,t),r&&e.apply(o,s)}},t.getElemDistance=function(e){var t=0;if(e.offsetParent)do t+=e.offsetTop,e=e.offsetParent;while(e);return t>=0?t:0},t.getElementOffset=function(e,t){var n=t;return n>1&&(n=1),n>0&&(n=0),Math.max(e.offsetHeight*n)},t.getScrollPosition=function(e){return"bottom"===e?Math.max((window.scrollY||window.pageYOffset)+(window.innerHeight||document.documentElement.clientHeight)):window.scrollY||window.pageYOffset},t.isInView=function(e,t,n){return this.getScrollPosition(t)>this.getElemDistance(e)+this.getElementOffset(e,n)},t.stripHTML=function(e){var t=document.createElement("DIV");return t.innerHTML=e,t.textContent||t.innerText||""},t.addAnimation=function(e,t){var i=n(),o=function s(){e.classList.remove(t),e.removeEventListener(i,s,!1)};e.classList.add(t),e.addEventListener(i,o,!1)},t.getRandomNumber=function(e,t){return Math.floor(Math.random()*(t-e)+e)}}]);
\ No newline at end of file
+!function(e){function t(i){if(n[i])return n[i].exports;var s=n[i]={exports:{},id:i,loaded:!1};return e[i].call(s.exports,s,s.exports,t),s.loaded=!0,s.exports}var n={};return t.m=e,t.c=n,t.p="/assets/scripts/dist/",t(0)}([function(e,t,n){e.exports=n(1)},function(e,t,n){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0}),t.Choices=void 0;var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),o=n(2),a=t.Choices=function(){function e(t){i(this,e);var n=document.createElement("FAKE_ELement"),s=t||{},o={element:document.querySelector("[data-choice]"),disabled:!1,create:!0,editItems:!1,maxItems:!1,delimiter:",",allowDuplicates:!0,debug:!1,placeholder:!1,callbackOnInit:function(){},callbackOnRender:function(){},callbackOnKeyUp:function(){},callbackOnKeyDown:function(){},callbackOnEntry:function(){},callbackOnRemove:function(){}};this.options=this.extend(o,s||{}),this.initialised=!1,this.supports="querySelector"in document&&"addEventListener"in document&&"classList"in n,this.element=this.options.element,this.valueArray=""!==this.element.value?this.cleanInputValue(this.element.value):[],this.valueCount=this.valueArray.length,this.onClick=this.onClick.bind(this),this.onKeyDown=this.onKeyDown.bind(this),this.onChange=this.onChange.bind(this),this.onFocus=this.onFocus.bind(this),this.onBlur=this.onChange.bind(this),this.init()}return s(e,[{key:"cleanInputValue",value:function(e){return e.replace(/\s/g,"").split(this.options.delimiter)}},{key:"extend",value:function(){for(var e={},t=arguments.length,n=function(t){for(var n in t)e[n]=t[n]},i=0;t>i;i++){var s=arguments[i];(0,o.isType)("Object",s)?n(s):console.error("Custom options must be an object")}return e}},{key:"isOpen",value:function(){}},{key:"isDisabled",value:function(){}},{key:"isEmpty",value:function(){return 0===this.valueCount.length}},{key:"clearInput",value:function(){this.input.value&&(this.input.value="")}},{key:"onKeyUp",value:function(e){}},{key:"onKeyDown",value:function(e){var t=this,n=e.ctrlKey||e.metaKey;if(n&&65===e.keyCode&&this.list&&this.list.children)for(var i=0;i<this.list.children.length;i++){var s=this.list.children[i];s.classList.add("is-selected")}if(13===e.keyCode&&e.target.value&&!function(){var e=t.input.value,n=function(){var n=!0;t.options.maxItems&&t.options.maxItems<=t.list.children.length&&(n=!1),t.options.allowDuplicates===!1&&t.element.value&&t.valueArray.indexOf(e)>-1&&(n=!1),n&&"text"===t.element.type&&(t.addItem(t.list,e),t.updateInputValue(e),t.clearInput(t.element))};n()}(),(8===e.keyCode||46===e.keyCode)&&!e.target.value){var o=function(){var e=t.list.querySelectorAll(".choices__item"),n=e[e.length-1];n&&n.classList.add("is-selected"),t.options.editItems&&n?(t.input.value=n.innerHTML,t.removeItem(n)):t.removeAll(e)};o(),e.preventDefault()}}},{key:"onFocus",value:function(e){}},{key:"onClick",value:function(e){}},{key:"onChange",value:function(e){}},{key:"addEventListeners",value:function(e){e.addEventListener("click",this.onClick),e.addEventListener("keyup",this.onKeyUp),e.addEventListener("keydown",this.onKeyDown),e.addEventListener("change",this.onChange),e.addEventListener("focus",this.onFocus),e.addEventListener("blur",this.onBlur)}},{key:"removeEventListeners",value:function(e){e.removeEventListener("click",this.onClick),e.removeEventListener("keyup",this.onKeyUp),e.removeEventListener("keydown",this.onKeyDown),e.removeEventListener("change",this.onChange),e.removeEventListener("focus",this.onFocus),e.removeEventListener("blur",this.onBlur)}},{key:"setValue",value:function(){}},{key:"getValue",value:function(){}},{key:"getValues",value:function(){}},{key:"getPlaceholder",value:function(){}},{key:"updateInputValue",value:function(e){this.options.debug&&console.debug("Update input value"),this.valueArray.push(e),this.element.value=this.valueArray.join(this.options.delimiter)}},{key:"removeInputValue",value:function(e){this.options.debug&&console.debug("Remove input value");var t=this.valueArray.indexOf(e);this.valueArray.splice(t,1),this.element.value=this.valueArray.join(this.options.delimiter)}},{key:"addItem",value:function(e,t){this.options.debug&&console.debug("Add item");var n=document.createElement("li");n.classList.add("choices__item"),n.textContent=t,e.appendChild(n)}},{key:"removeAll",value:function(e){for(var t=0;t<e.length;t++){var n=e[t];n.classList.contains("is-selected")&&(this.removeItem(n),this.removeInputValue(n.textContent))}}},{key:"removeItem",value:function(e){e&&e.parentNode.removeChild(e)}},{key:"init",value:function(){this.supports||console.error("Your browser doesn'nt support shit"),this.initialised=!0,this.render(this.element)}},{key:"renderTextInput",value:function(){var e=this,t=document.createElement("div");t.className="choices choices--active";var n=document.createElement("div");n.className="choices__inner",this.element.classList.add("choices__input","choices__input--hidden"),this.element.tabIndex="-1",this.element.setAttribute("style","display:none;"),this.element.setAttribute("aria-hidden","true"),(0,o.wrap)(this.element,n),(0,o.wrap)(n,t);var i=document.createElement("ul");i.className="choices__list choices__list--items";var s=document.createElement("input");s.type="text",s.className="choices__input choices__input--cloned",s.placeholder&&(s.placeholder=this.element.placeholder),n.appendChild(i),n.appendChild(s),t.appendChild(n),this.containerOuter=t,this.containerInner=n,this.input=s,this.list=i,""!==this.element.value&&this.valueArray.forEach(function(t){e.addItem(e.list,t)}),this.addEventListeners(this.input)}},{key:"renderSelectInput",value:function(){var e=document.createElement("div");e.className="choices choices--active";var t=document.createElement("div");t.className="choices__inner",this.element.classList.add("choices__input","choices__input--hidden"),this.element.tabIndex="-1",this.element.setAttribute("style","display:none;"),this.element.setAttribute("aria-hidden","true"),(0,o.wrap)(this.element,t),(0,o.wrap)(t,e);var n=document.createElement("ul");n.className="choices__list choices__list--options";var i=document.createElement("input");i.type="text",i.className="choices__input choices__input--cloned",t.appendChild(i),t.appendChild(n),e.appendChild(t),this.containerOuter=e,this.containerInner=t,this.input=i,this.list=null,this.options=n;var s=this.element.children;if(s)for(var a=0;a<s.length;a++){var r=s[a];if("OPTGROUP"===r.tagName){this.addItem(this.options,r.label);for(var l=0;l<r.children.length;l++){var u=r.children[l];this.addItem(this.options,u.innerHTML)}}else"OPTION"===r.tagName&&this.addItem(this.options,r.innerHTML)}this.addEventListeners(this.input)}},{key:"renderMultipleSelectInput",value:function(){}},{key:"render",value:function(){switch(this.options.debug&&console.debug("Render"),this.element.type){case"text":this.renderTextInput();break;case"select-one":this.renderSelectInput();break;case"select-multiple":this.renderMultipleSelectInput();break;default:rthis.renderTextInput()}}},{key:"destroy",value:function(){this.options=null,this.element=null,this.initialised=null,this.removeEventListeners(this.input)}}]),e}();!function(){var e=document.getElementById(1),t=document.getElementById(2),n=document.getElementById(3),i=document.getElementById(4);new a({element:e,delimiter:" ",maxItems:5}),new a({element:t,allowDuplicates:!1,editItems:!0}),new a({element:n}),new a({element:i})}()},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=(t.hasClass=function(e,t){return new RegExp(" "+t+" ").test(" "+e.className+" ")},t.capitalise=function(e){return e.replace(/\w\S*/g,function(e){return e.charAt(0).toUpperCase()+e.substr(1).toLowerCase()})},t.isType=function(e,t){var n=Object.prototype.toString.call(t).slice(8,-1);return void 0!==t&&null!==t&&n===e},t.whichTransitionEvent=function(){var e,t=document.createElement("fakeelement"),n={transition:"transitionend",OTransition:"oTransitionEnd",MozTransition:"transitionend",WebkitTransition:"webkitTransitionEnd"};for(e in n)if(void 0!==t.style[e])return n[e]},t.whichAnimationEvent=function(){var e,t=document.createElement("fakeelement"),n={animation:"animationend",OAnimation:"oAnimationEnd",MozAnimation:"animationend",WebkitAnimation:"webkitAnimationEnd"};for(e in n)if(void 0!==t.style[e])return n[e]});t.getParentsUntil=function(e,t,n){for(var i=[];e&&e!==document;e=e.parentNode){if(t){var s=t.charAt(0);if("."===s&&e.classList.contains(t.substr(1)))break;if("#"===s&&e.id===t.substr(1))break;if("["===s&&e.hasAttribute(t.substr(1,t.length-1)))break;if(e.tagName.toLowerCase()===t)break}if(n){var o=n.charAt(0);"."===o&&e.classList.contains(n.substr(1))&&i.push(e),"#"===o&&e.id===n.substr(1)&&i.push(e),"["===o&&e.hasAttribute(n.substr(1,n.length-1))&&i.push(e),e.tagName.toLowerCase()===n&&i.push(e)}else i.push(e)}return 0===i.length?null:i},t.wrap=function(e,t){return t=t||document.createElement("div"),e.nextSibling?e.parentNode.insertBefore(t,e.nextSibling):e.parentNode.appendChild(t),t.appendChild(e)},t.getSiblings=function(e){for(var t=[],n=e.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==e&&t.push(n);return t},t.findAncestor=function(e,t){for(;(e=e.parentElement)&&!e.classList.contains(t););return e},t.debounce=function(e,t,n){var i;return function(){var s=this,o=arguments,a=function(){i=null,n||e.apply(s,o)},r=n&&!i;clearTimeout(i),i=setTimeout(a,t),r&&e.apply(s,o)}},t.getElemDistance=function(e){var t=0;if(e.offsetParent)do t+=e.offsetTop,e=e.offsetParent;while(e);return t>=0?t:0},t.getElementOffset=function(e,t){var n=t;return n>1&&(n=1),n>0&&(n=0),Math.max(e.offsetHeight*n)},t.getScrollPosition=function(e){return"bottom"===e?Math.max((window.scrollY||window.pageYOffset)+(window.innerHeight||document.documentElement.clientHeight)):window.scrollY||window.pageYOffset},t.isInView=function(e,t,n){return this.getScrollPosition(t)>this.getElemDistance(e)+this.getElementOffset(e,n)},t.stripHTML=function(e){var t=document.createElement("DIV");return t.innerHTML=e,t.textContent||t.innerText||""},t.addAnimation=function(e,t){var i=n(),s=function o(){e.classList.remove(t),e.removeEventListener(i,o,!1)};e.classList.add(t),e.addEventListener(i,s,!1)},t.getRandomNumber=function(e,t){return Math.floor(Math.random()*(t-e)+e)}}]);
\ No newline at end of file
diff --git a/assets/scripts/src/choices.js b/assets/scripts/src/choices.js
index f80889f..66c2ce9 100644
--- a/assets/scripts/src/choices.js
+++ b/assets/scripts/src/choices.js
@@ -123,10 +123,12 @@ export class Choices {
 
         // Handle select all 
         if (ctrlDown && e.keyCode === 65) {
-            for (let i = 0; i < this.list.children.length; i++) {
-                let listItem = this.list.children[i];
+            if(this.list && this.list.children) {
+                for (let i = 0; i < this.list.children.length; i++) {
+                    let listItem = this.list.children[i];
 
-                listItem.classList.add('is-selected');
+                    listItem.classList.add('is-selected');
+                }
             }
         }
 
@@ -224,26 +226,13 @@ export class Choices {
     }
 
     /* Methods */
+    setValue() {}
 
-    setPlaceholder() {
+    getValue() {}
 
-    }
+    getValues() {}
 
-    setValue() {
-
-    }
-
-    getValue() {
-
-    }
-
-    getPlaceholder() {
-
-    }
-
-    search() {
-
-    }
+    getPlaceholder() {}
 
     updateInputValue(value) {
         if (this.options.debug) console.debug('Update input value');
@@ -298,6 +287,16 @@ export class Choices {
     }
 
     renderTextInput() {
+        // Template:
+        // 
+        // <div class="choices choices--active">
+        //     <div class="choices__inner">
+        //         <input id="1" type="text" data-choice="" class="choices__input choices__input--hidden" tabindex="-1" style="display:none;" aria-hidden="true">
+        //         <ul class="choices__list choices__list--items"></ul>
+        //         <input type="text" class="choices__input choices__input--cloned">
+        //     </div>
+        // </div>
+
         let containerOuter = document.createElement('div');
         containerOuter.className = 'choices choices--active';
 
@@ -383,13 +382,21 @@ export class Choices {
         this.list = null;
         this.options = options;
 
-        let initialOptions = this.element.options;
+        let initialOptions = this.element.children;
 
         if (initialOptions) {
-            // Add any preset values
             for (let i = 0; i < initialOptions.length; i++) {
-                let option = initialOptions[i];
-                this.addItem(this.options, option.innerHTML);
+                let parentOption = initialOptions[i];
+        
+                if(parentOption.tagName === 'OPTGROUP') {
+                    this.addItem(this.options, parentOption.label);
+                    for (let j = 0; j < parentOption.children.length; j++) {
+                        let childOption = parentOption.children[j];
+                        this.addItem(this.options, childOption.innerHTML);
+                    }
+                } else if(parentOption.tagName === 'OPTION') {
+                    this.addItem(this.options, parentOption.innerHTML);
+                }
             }
         }
 
@@ -397,6 +404,10 @@ export class Choices {
         this.addEventListeners(this.input);
     }
 
+    renderMultipleSelectInput() {
+
+    }
+
     render() {
         if (this.options.debug) console.debug('Render');
 
@@ -408,7 +419,7 @@ export class Choices {
                 this.renderSelectInput();
                 break;
             case "select-multiple":
-                console.warn('Choices does not support multiple select boxes');
+                this.renderMultipleSelectInput();
                 break;
             default:
                 rthis.renderTextInput();
@@ -429,6 +440,7 @@ export class Choices {
     let input1 = document.getElementById(1);
     let input2 = document.getElementById(2);
     let input3 = document.getElementById(3);
+    let input4 = document.getElementById(4);
 
     let choices1 = new Choices({
         element : input1,
@@ -445,4 +457,9 @@ export class Choices {
     let choices3 = new Choices({
         element : input3
     });
+
+
+    let choices4 = new Choices({
+        element : input4
+    });
 })();
\ No newline at end of file
diff --git a/index.html b/index.html
index 228b39d..41919a7 100644
--- a/index.html
+++ b/index.html
@@ -22,6 +22,19 @@
         <option value="Value 6">Value 6</option>
     </select>
 
+    <select id="4" name="4" data-choice>
+        <optgroup label="Group 1">
+            <option value="Value 1">Value 1</option>
+            <option value="Value 2">Value 2</option>
+            <option value="Value 3">Value 3</option>
+        </optgroup>
+        <optgroup label="Group 2">
+            <option value="Value 4">Value 4</option>
+            <option value="Value 5">Value 5</option>
+            <option value="Value 6">Value 6</option>
+        </optgroup>
+    </select>
+
 <!--     <label for="4">Multiple select input with two options</label>
     <select id="4" name="4" data-choice multiple>
         <option value="Value 1">Value 1</option>