diff --git a/.gitignore b/.gitignore
index 640116f..ad6ac8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@
 /node_modules/
 /app/Resources/libs/semantic/dist
 /web/resources/
+/web/media/
 .php_cs.cache
\ No newline at end of file
diff --git a/README.md b/README.md
index fb24ea2..67d510c 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,8 @@ For full requirements see Symfony 3.2 [docs](http://symfony.com/doc/3.2/referenc
 
 #### Database
 1. Set application parameters in *app/config/parameters.yml*
-2. Generate empty database by running command `$ php bin/console doctrine:database:create`    
-3. Load LDraw models into database by running commad `$ php bin/console app:load:ldraw [ldraw_dir_path]` 
+2. Generate empty database by running command `$ php bin/console doctrine:database:create`   
+3. Create database tables by running command `$ bin/console doctrine:schema:create`
+3. Load LDraw models into database by running commad `$ php bin/console app:load:models <ldraw_dir> [--all] [--file=FILE] [--update]`
 4. Load Rebrickable data into database by running command `$ php bin/console app:load:rebrickable`  
 5. Load relations between LDraw models and Rebrickable parts by running command `$ php bin/console app:load:relation`  
\ No newline at end of file
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 0718d4f..302254e 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -20,6 +20,7 @@ class AppKernel extends Kernel
             new Oneup\FlysystemBundle\OneupFlysystemBundle(),
             new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),
             new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
+            new Liip\ImagineBundle\LiipImagineBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
diff --git a/app/Resources/assets/images/brickset_logo.png b/app/Resources/assets/images/brickset_logo.png
new file mode 100644
index 0000000..f1eee4d
Binary files /dev/null and b/app/Resources/assets/images/brickset_logo.png differ
diff --git a/app/Resources/assets/images/rebrickable_logo.png b/app/Resources/assets/images/rebrickable_logo.png
new file mode 100644
index 0000000..4651fd8
Binary files /dev/null and b/app/Resources/assets/images/rebrickable_logo.png differ
diff --git a/app/Resources/assets/js/ModelViewer.js b/app/Resources/assets/js/ModelViewer.js
index 09bc7cc..7423b8f 100644
--- a/app/Resources/assets/js/ModelViewer.js
+++ b/app/Resources/assets/js/ModelViewer.js
@@ -1,85 +1,277 @@
-ModelViewer = function() {
-    var container;
-    var camera, cameraTarget, scene,  renderer, controls, object;
-    var width, height;
+var ModelViewer = function($dom_element, model_url) {
+    var $this = this;
+    this.container = document.createElement('div');
+    this.container.setAttribute('class','model-view');
+    this.dom_element = $dom_element;
+    $dom_element.append(this.container);
 
-    this.initScene = function($container) {
-        width  = parseFloat($container.width());
-        height = parseFloat($container.height());
+    this.camera = null;
+    this.scene = null;
+    this.renderer = null;
+    this.controls = null;
+    this.width  = parseFloat($dom_element.width());
+    this.height = parseFloat($dom_element.height());
+    this.scale = 1;
+    this.wireframe = false;
+    this.rendering = false;
+    this.container.style.display = "none";
+    this.toggleButton = null;
+    this.background = 0xffffff;
+    this.model_url = model_url;
+    this.loaded = false;
 
-        camera = new THREE.PerspectiveCamera(45, width/height, 0.1, 1000);
-        camera.position.set(-2, 2, 0.8);
-        camera.lookAt(new THREE.Vector3(0, 3, 0));
+    this.object = null;
 
-        scene = new THREE.Scene();
-        scene.fog = new THREE.FogExp2(0x000000, 0.001);
-
-        // var grid = new THREE.GridHelper( 30, 70 );
-        // // grid.position.set(30/70,-0.5,30/70);
-        // scene.add( grid );
-
-        // Lights
-
-        light = new THREE.DirectionalLight( 0xffffff );
-        light.position.set( 1, 1, 1 );
-        scene.add( light );
-
-        light = new THREE.DirectionalLight( 0x002288 );
-        light.position.set( -1, -1, -1 );
-        scene.add( light );
+    this.initHtml();
+    this.initScene();
 
 
-        scene.add( new THREE.AmbientLight( 0xf0f0f0 ));
-        scene.background = new THREE.Color( 0x000000 );
+    // this.stats = new Stats();
+    // this.stats.dom.style.position = 'absolute';
+    // this.container.append(this.stats.dom);
 
-        // renderer
-        renderer = new THREE.WebGLRenderer();
-        renderer.setClearColor( scene.fog.color );
-        renderer.setPixelRatio( window.devicePixelRatio );
-        renderer.setSize( width, height );
-        renderer.gammaInput = true;
-        renderer.gammaOutput = true;
-        renderer.shadowMap.enabled = true;
-        renderer.shadowMap.renderReverseSided = false;
 
-        $container.append(renderer.domElement);
+    function renderLoop() {
+        requestAnimationFrame(renderLoop);
+        if($this.rendering) {
+            if(!$this.loaded) {
+                $this.loadStl($this.model_url);
+                $this.loaded = true;
+            }
 
-        controls = new THREE.OrbitControls( camera, renderer.domElement );
-        controls.addEventListener( 'change', this.render ); // add this only if there is no animation loop (requestAnimationFrame)
-        // controls.enableDamping = true;
-        // controls.dampingFactor = 0.25;
-        controls.enableZoom = true;
-    };
+            if($this.stats) {
+                $this.stats.update();
+            }
+            $this.render();
+        }
+
+        $this.resize(parseInt($this.dom_element.width()), parseInt($this.dom_element.height()));
+    }
+
+
+    renderLoop();
+};
+
+ModelViewer.prototype.initHtml = function () {
+    $this = this;
+
+    var buttons = document.createElement("div");
+    buttons.setAttribute("class", "modelviewer-buttons");
+
+    this.wireframeButton = $('<button/>', {
+        'class':'model',
+        'style':'display:none',
+        'html':'<i class="eye icon"/>Wireframe',
+        'click': $this.toggleMaterial.bind($this)
+    }).appendTo(buttons);
+
+    this.toggleButton = $('<button/>', {
+        'class':'toggle',
+        'html':'<i class="cube icon"/>3D',
+        'click': $this.toggleRendering.bind($this)
+    }).appendTo(buttons);
+
+    this.dom_element.append(buttons);
+};
+
+ModelViewer.prototype.initCamera = function () {
+    this.camera = new THREE.PerspectiveCamera(45, this.width / this.height, .1, 300);
+    this.camera.position.z = 80;
+    this.camera.position.y = -45;
+    this.camera.position.x = 35;
+    this.camera.up = new THREE.Vector3(0, 0, 1);
+};
+
+ModelViewer.prototype.initScene = function() {
+    this.scene = new THREE.Scene();
+    this.scene.background = new THREE.Color( this.background );
+
+    this.scene.fog = new THREE.FogExp2(this.background, 0.06);
+
+    this.initLights();
+    this.initCamera();
+
+    var groundPlaneMaterial = new THREE.MeshPhongMaterial({
+        color: 0xFFFFFF,
+        wireframe: false,
+        transparent: true,
+        opacity: 0.25,
+        fog: false,
+        specular: 0x999999,
+        shininess: 100
+    });
+
+    this.plane = new THREE.Mesh(new THREE.PlaneGeometry(80,80), groundPlaneMaterial);
+    this.plane.receiveShadow = true;
+    this.scene.add(this.plane);
+
+    this.grid = new THREE.GridHelper( 80, 100, 0x000000, 0xAAAAAA);
+    this.grid.rotation.x = Math.PI/2;
+    this.scene.add(this.grid);
+
+    this.renderer = new THREE.WebGLRenderer();
+    this.renderer.setSize(this.width, this.height);
+    this.renderer.setPixelRatio(window.devicePixelRatio ? window.devicePixelRatio : 1);
+
+    this.container.append(this.renderer.domElement);
+
+    this.controls = new THREE.OrbitControls( this.camera, this.renderer.domElement );
+    this.controls.enableZoom = true;
+};
+
+ModelViewer.prototype.initLights = function () {
+    this.spotLight = new THREE.SpotLight(0xffffff, 0.8, 0);
+    this.spotLight.position.set(-100, 100, 100);
+    this.spotLight.castShadow = false;
+    this.scene.add(this.spotLight);
+
+    this.bottomSpotLight = new THREE.SpotLight(0xffffff, 0.8, 0);
+    this.bottomSpotLight.position.set(0, -10, -100);
+    this.bottomSpotLight.castShadow = false;
+    this.scene.add(this.bottomSpotLight);
+
+    this.ambientLight = new THREE.AmbientLight(0xffffff, 0.1);
+    this.scene.add(this.ambientLight);
+
+    this.pointLight = new THREE.PointLight(0xfdfdfd, 1, 0);
+    this.pointLight.position.set(32, -39, 35);
+    this.pointLight.castShadow = true;
+    this.scene.add(this.pointLight);
+};
+
+ModelViewer.prototype.addModel = function(geometry) {
+    var material = new THREE.MeshPhongMaterial({
+        color: 0x136fc3,
+        specular: 0x0D0D0D,
+        shading: THREE.SmoothShading,
+        shininess: 30,
+        fog: false,
+        side: THREE.DoubleSide,
+        wireframe: this.wireframe,
+    });
+
+    geometry.center();
+    var mesh = new THREE.Mesh(geometry, material);
+
+    mesh.scale.set(this.scale, this.scale, this.scale);
+
+    mesh.geometry.computeFaceNormals();
+    mesh.geometry.computeVertexNormals();
+    mesh.rotation.set(-Math.PI/2,0, 0);
+    mesh.geometry.computeBoundingBox();
+
+    mesh.castShadow = true;
+    // mesh.receiveShadow = true;
+
+    var dims = mesh.geometry.boundingBox.max.clone().sub(mesh.geometry.boundingBox.min);
+
+    maxDim = Math.max(Math.max(dims.x, dims.y), dims.z);
+
+    mesh.position.x = -(mesh.geometry.boundingBox.min.x + mesh.geometry.boundingBox.max.x) / 2 * this.scale;
+    mesh.position.z = -(mesh.geometry.boundingBox.min.y + mesh.geometry.boundingBox.max.y) / 2 * this.scale;
+    mesh.position.y = -mesh.geometry.boundingBox.min.z * this.scale;
+
+    var positionY = (mesh.geometry.boundingBox.max.z + mesh.geometry.boundingBox.min.z)/2 * this.scale;
+    var positionZ = (mesh.geometry.boundingBox.max.y - mesh.geometry.boundingBox.min.y)/2 * this.scale;
+
+    mesh.position.set(0, positionY, positionZ);
+
+    this.object = mesh;
+
+    this.scene.add(mesh);
+
+    this.centerCamera(mesh);
+};
+
+ModelViewer.prototype.loadStl = function(model) {
+    var self = this;
+
+    var loader = new THREE.STLLoader();
 
-    this.loadStl = function(model) {
-        var loader = new THREE.STLLoader();
         loader.load(model, function (geometry) {
-            var material = new THREE.MeshPhongMaterial({color: 0xaaaaaa, shininess:200,  specular: 0x333333, shading: THREE.FlatShading});
+                self.addModel(geometry);
+        }
+        );
+};
 
-            var mesh = new THREE.Mesh(geometry, material);
+ModelViewer.prototype.centerCamera = function(mesh) {
 
-            mesh.geometry.computeBoundingBox();
-            var positionY = (mesh.geometry.boundingBox.max.y + mesh.geometry.boundingBox.min.y)/2;
+    var boxHelper =  new THREE.BoxHelper( mesh );
 
-            // mesh.position.set(0, positionY, 0);
-            mesh.rotation.set(Math.PI, 0, 0);
-            mesh.castShadow = true;
-            mesh.receiveShadow = true;
-            scene.add(mesh);
-            
-            renderer.render(scene, camera);
-        });
-    };
+    var sceneCenter = this.objectCenter(mesh);
 
-    this.animate = function() {
+    var geometry = mesh.geometry;
 
-        requestAnimationFrame( this.animate );
-        this.render();
-    };
 
-    this.render = function() {
+    var distanceX = ((geometry.boundingBox.max.x - geometry.boundingBox.min.x) / 2) / Math.tan(this.camera.fov * this.camera.aspect * Math.PI / 360);
+    var distanceY = (geometry.boundingBox.max.y - geometry.boundingBox.min.y) / 2 / Math.tan(this.camera.fov * this.camera.aspect * Math.PI / 360);
+    var distanceZ = (geometry.boundingBox.max.z - geometry.boundingBox.min.z) / 2 / Math.tan(this.camera.fov * Math.PI / 360);
 
-        renderer.render(scene, camera);
+    var maxDistance = Math.max(Math.max(distanceX, distanceY), distanceZ);
+    maxDistance *= 1.9 * this.scale;
 
-    };
+    var cameraPosition = this.camera.position.normalize().multiplyScalar(maxDistance);
+
+    this.controls.maxDistance = 3 * maxDistance;
+
+    this.controls.position0 = cameraPosition;
+    this.controls.target0 = sceneCenter;
+    this.controls.reset();
+};
+
+ModelViewer.prototype.toggleRendering = function () {
+    if($this.rendering) {
+        $this.container.style.display = "none";
+        $this.rendering = false;
+        $this.toggleButton.html('<i class="cube icon"/>3D');
+        $this.wireframeButton.hide();
+    } else {
+        $this.container.style.display = "block";
+        $this.rendering = true;
+        $this.toggleButton.html('<i class="close icon"/>Close');
+        $this.wireframeButton.show();
+    }
+};
+
+ModelViewer.prototype.toggleMaterial = function () {
+    if($this.wireframe) {
+        $this.wireframe = false;
+        $this.wireframeButton.html('<i class="eye icon"/>Wireframe')
+    } else {
+        $this.wireframe = true;
+        $this.wireframeButton.html('<i class="eye icon"/>Solid')
+    }
+
+    this.scene.traverse(function(object) {
+        if (object instanceof THREE.Mesh) {
+            object.material.wireframe = $this.wireframe;
+        }
+    });
+};
+
+ModelViewer.prototype.objectCenter = function (mesh) {
+    var middle = new THREE.Vector3();
+    var geometry = mesh.geometry;
+
+    geometry.center();
+    geometry.computeBoundingBox();
+
+    middle.x = (geometry.boundingBox.max.x + geometry.boundingBox.min.x) / 2;
+    middle.y = (geometry.boundingBox.max.y + geometry.boundingBox.min.y) / 2;
+    middle.z = (geometry.boundingBox.max.z + geometry.boundingBox.min.z) / 2;
+
+    mesh.localToWorld(middle);
+    return middle;
+};
+
+ModelViewer.prototype.resize = function(width, height) {
+    this.width = width;
+    this.height = height;
+    this.camera.aspect = width / height;
+    this.camera.updateProjectionMatrix();
+    this.renderer.setSize(width, height);
+};
+
+ModelViewer.prototype.render = function() {
+    this.renderer.render(this.scene, this.camera);
 };
\ No newline at end of file
diff --git a/app/Resources/assets/js/style.js b/app/Resources/assets/js/style.js
index 1dd56df..b3d57cb 100644
--- a/app/Resources/assets/js/style.js
+++ b/app/Resources/assets/js/style.js
@@ -2,4 +2,27 @@ $(document).ready(function () {
     $('.ui.dropdown')
         .dropdown()
     ;
+
+    $('.image.load img')
+        .visibility({
+            type       : 'image',
+            transition : 'fade in',
+            duration   : 1000
+        })
+    ;
+
+    $('.ui.rating')
+        .rating("disable")
+    ;
+
+    $('.tabular.menu .item').tab();
+
+    $('.message .close')
+        .on('click', function() {
+            $(this)
+                .closest('.message')
+                .transition('fade')
+            ;
+        })
+    ;
 });
\ No newline at end of file
diff --git a/app/Resources/assets/style/main.scss b/app/Resources/assets/style/main.scss
index f61917a..5f2e904 100644
--- a/app/Resources/assets/style/main.scss
+++ b/app/Resources/assets/style/main.scss
@@ -1,3 +1,43 @@
-.ui.fixed + .ui.main {
-  margin-top: 5em;
+.default-theme {
+
+  .ui.fixed + .ui.grid {
+    border-radius: 0;
+    border: 0;
+    box-shadow: none;
+  }
+
+  .item-info {
+    min-height: 300px;
+  }
+
+  .ui.fixed + .ui.main {
+    margin-top: 3em;
+    padding-bottom: 4em;
+  }
+
+  .link {
+    padding-left: 30px;
+    position: relative;
+  }
+
+  .link:before {
+    width: 23px;
+    height: 23px;
+    position: absolute;
+    left: 0;
+    display: inline-block;
+  }
+
+  .link.brickset:before {
+    content: '';
+    background: url("/resources/images/brickset_logo.png");
+    background-size: cover;
+  }
+
+  .link.rebrickable:before {
+    content: '';
+    background: url("/resources/images/rebrickable_logo.png");
+    background-size: cover;
+  }
+
 }
\ No newline at end of file
diff --git a/app/Resources/assets/style/modelviewer.scss b/app/Resources/assets/style/modelviewer.scss
new file mode 100644
index 0000000..cf9a0bc
--- /dev/null
+++ b/app/Resources/assets/style/modelviewer.scss
@@ -0,0 +1,34 @@
+.model-container {
+  width: 100%;
+  position: relative;
+  border: 1px solid #DDDDDD;
+
+  img {
+    width: 100%;
+    height: 100%;
+  }
+
+  .modelviewer-buttons {
+    text-align: right;
+    position: absolute;
+    top: 0;
+    height: 35px;
+    width: 100%;
+    padding: 3px 4px;
+
+    > button {
+      border: none;
+      height: 100%;
+      margin-left: 5px;
+      padding: 0 15px;
+    }
+  }
+
+  .model-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
+}
\ No newline at end of file
diff --git a/app/Resources/assets/style/style.scss b/app/Resources/assets/style/style.scss
index 263739b..3d8299a 100644
--- a/app/Resources/assets/style/style.scss
+++ b/app/Resources/assets/style/style.scss
@@ -1,4 +1,4 @@
 @import "variables";
 
 @import "main";
-
+@import "modelviewer";
diff --git a/app/Resources/relations/alias_model.yml b/app/Resources/relations/alias_model.yml
index c602122..095ec1f 100644
--- a/app/Resources/relations/alias_model.yml
+++ b/app/Resources/relations/alias_model.yml
@@ -46,6 +46,8 @@
 4168950: 3815c01
 73418: 3815c01
 
+82359: 3626b
+
 122c02: 122c01
 
 # Bucket 1 x 1 x 1 Cylindrical
@@ -119,6 +121,22 @@ u9147p01c06: u9147p01c02
 u9147p02c02: u9147p01c02
 u9147p03c02: u9147p01c02
 
+# Figure Fabuland Monkey
+u595p01c08: u595p01c04
+u595p01c07: u595p01c04
+u595p01c06: u595p01c04
+u595p01c05: u595p01c04
+
+# Figure Fabuland Monkey Head
+u595p02c03: u595p02c02
+
+# Figure Fabuland Monkey 2
+u595p02c05: u595p02c04
+
+# Figure Fabuland Mouse 1
+u9105p01c06: u9105p01c02
+u9105p01c03: u9105p01c02
+
 # Figure Fabuland Elephant Head
 u588p02c02: u588p01c02
 
@@ -164,4 +182,39 @@ u588p02c02: u588p01c02
 
 # Hinge Control Stick and Base
 73587: 4592c01
-4296152: 4592c01
\ No newline at end of file
+4296152: 4592c01
+
+4505: 4505a
+6093: 6093a
+
+90462a: 90462
+
+# Minifig Mechanical SW Battle Droid
+30375cs1: 30375cs0
+30375cs2: 30375cs0
+30375cs3: 30375cs0
+
+2958c01: 2723
+
+32181c03: 32181c01
+
+76019: 76244
+4107539: 76244
+
+3680c02: 3680c01
+4221774: 3680c01
+9245: 3680c01
+9246: 3680c01
+9258: 3680c01
+9328: 3680c01
+9352: 3680c01
+
+4508c01: 251c01
+
+4100338: 2557c01
+4100340: 6051c01
+
+4100339: 2559c01
+75192: 2977c01
+
+4539364: 64776
\ No newline at end of file
diff --git a/app/Resources/relations/part_model.yml b/app/Resources/relations/part_model.yml
index 32e6af6..31c85be 100644
--- a/app/Resources/relations/part_model.yml
+++ b/app/Resources/relations/part_model.yml
@@ -89,7 +89,6 @@
 10119: 51704
 3149: 3149d
 75998: 4493c00
-10119: 51704
 30658: 3404
 
 59275: 2599
@@ -153,4 +152,59 @@ wheel2a: 568c01
 11895pr0001c01: 11895
 92456pr0021c01: 92241p03c01
 
-15672: 92946
\ No newline at end of file
+15672: 92946
+
+3614a: 3614
+3614b: 3614
+
+75215: 4694c01
+
+6093: 6093a
+
+3626bpr0895: 82359
+
+6272c01: 6272
+
+76320: 32181c02
+
+95292c01: 75348
+2909c03: 75348
+2909c02: 75348
+
+# Technic figures
+tech001: 2698c01
+tech002: 2698c01
+tech003: 2698c01
+tech004: 2698c01
+tech005: 2698c01
+tech006: 2698c01
+tech007: 2698c01
+tech008: 2698c01
+tech009: 2698c01
+tech010: 2698c01
+tech011: 2698c01
+tech011a: 2698c01
+tech012: 2698c01
+tech013: 2698c01
+tech014: 2698c01
+tech014a: 2698c01
+tech015: 2698c01
+tech016: 2698c01
+tech016a: 2698c01
+tech017: 2698c01
+tech017a: 2698c01
+tech018: 2698c01
+tech019: 2698c01
+tech020: 2698c01
+tech021: 2698c01
+tech022: 2698c01
+tech023: 2698c01
+tech024: 2698c01
+tech025: 2698c01
+tech026: 2698c01
+tech027: 2698c01
+tech028: 2698c01
+tech029: 2698c01
+
+33299a: 33299
+33299b: 33299
\ No newline at end of file
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index f8dff0e..491df83 100644
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -1,40 +1,48 @@
+{% extends 'html.html.twig' %}
+
 {% import 'macros/elements.html.twig' as elements %}
 
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8" />
-        <title>{% block title %}Welcome!{% endblock %}</title>
-        {% block stylesheets %}
-            <link rel="stylesheet" href="{{ asset('resources/css/main.css') }}">
-        {% endblock %}
-        <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
-    </head>
-    <body>
-        {% block body %}
-            <div class="ui fixed inverted menu">
-                {{ knp_menu_render('mainMenu') }}
+{% block body %}
+    <div class="ui fixed inverted menu">
+        {{ knp_menu_render('mainMenu') }}
+    </div>
+    {% block page %}
+        <div class="ui main">
+            <div class="ui container">
+                <div class="ui masthead vertical segment">
+                    <div class="introduction">
+                        <div class="ui small breadcrumb">
+                            {% for breadcrumb_item in knp_menu_get_breadcrumbs_array(knp_menu_get_current_item('mainMenu')) %}
+                                {% if not loop.last %}
+                                    <a class="section" href="{{ breadcrumb_item.uri }}">{{ breadcrumb_item.label }}</a>
+                                    <i class="right chevron icon divider"></i>
+                                {% else %}
+                                    <a class="active section">{{ breadcrumb_item.label }}</a>
+                                {% endif %}
+                            {% endfor %}
+                        </div>
+                        <h1 class="ui header">{% block header %}{% endblock %}</h1>
+                    </div>
+                </div>
+                <div class="ui vertical segment content">
+                    {% for label, flashes in app.session.flashbag.all %}
+                        {% for flash in flashes %}
+                            {{ elements.flash(label,flash) }}
+                        {% endfor %}
+                    {% endfor %}
+
+                    {% block content %}
+
+                    {% endblock %}
+                </div>
             </div>
-            <div class="ui main container">
-            {% for label, flashes in app.session.flashbag.all %}
-                {% for flash in flashes %}
-                    {{ elements.flash(label,flash) }}
-                {% endfor %}
-            {% endfor %}
-            {% block content %}
+        </div>
+    {% endblock page %}
+    <div class="ui black inverted vertical footer segment stripe">
+        {% block footer %}
+            <div class="ui center aligned container">
 
-            {% endblock %}
             </div>
-        {% endblock %}
-
-        {% block javascripts %}
-
-            <script type="text/javascript" src="{{ asset('resources/js/three.js') }}"></script>
-
-            <script type="text/javascript" src="{{ asset('resources/js/OrbitControls.js') }}"></script>
-
-
-            <script src="{{ asset('resources/js/main.js') }}"></script>
-        {% endblock %}
-    </body>
-</html>
+        {% endblock  %}
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/brickset/browse.html.twig b/app/Resources/views/brickset/browse.html.twig
index 8bab86c..70cd9a4 100644
--- a/app/Resources/views/brickset/browse.html.twig
+++ b/app/Resources/views/brickset/browse.html.twig
@@ -14,12 +14,14 @@
     </div>
     {{ form_end(form) }}
 
+    <h3>{{ sets|length }}</h3>
+
     <div class="ui seven column grid">
         <div class="row">
             {% for set in sets %}
                 <div class="column">
                    <a href="{{ url('set_detail', {'number': set.number~'-'~set.numberVariant, 'name' : set.name|escape('url') }) }}">
-                       <img style="width: 100%" src="{{ set.largeThumbnailURL }}">
+                       <img style="width: 100%" src="{{ set.legoSetID|setImage|imagine_filter('rebrickable_set_min') }}">
                        <p>{{ set.LegoSetID }} - {{ set.name }}</p>
                    </a>
                 </div>
diff --git a/app/Resources/views/brickset/images.html.twig b/app/Resources/views/brickset/images.html.twig
new file mode 100644
index 0000000..7434637
--- /dev/null
+++ b/app/Resources/views/brickset/images.html.twig
@@ -0,0 +1,9 @@
+<div class="ui six doubling cards">
+    {% for image in images %}
+        <div class="card">
+            <a class="ui bordered fluid image" href="{{ image.imageURL }}" data-lightbox="setImages">
+                <img src="{{ image.thumbnailURL }}">
+            </a>
+        </div>
+    {% endfor %}
+</div>
\ No newline at end of file
diff --git a/app/Resources/views/brickset/instructions.html.twig b/app/Resources/views/brickset/instructions.html.twig
new file mode 100644
index 0000000..43c983d
--- /dev/null
+++ b/app/Resources/views/brickset/instructions.html.twig
@@ -0,0 +1,30 @@
+{% import 'macros/utils.html.twig' as utils %}
+
+{% if instructions|length != 0 %}
+    <p>
+        {{ 'set.instructions.text' | trans }}
+    </p>
+
+    <table class="ui celled padded table">
+        <thead>
+        <tr>
+            <th>{{ 'set.instructions.description' | trans }}</th>
+            <th>{{ 'set.instructions.filesize' | trans }}</th>
+            <th>{{ 'set.instructions.filename' | trans }}</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for instruction in instructions %}
+            <tr>
+                <td>{{ instruction.description }}</td>
+                <td>{{ utils.bytesToSize( remoteSize(instruction.uRL)) }}</td>
+                <td><a href="{{ instruction.uRL }}">{{ remoteFilename(instruction.uRL) }}</a></td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+{% else %}
+    <h2 class="ui center aligned icon">
+        <i class="circular warning icon"></i>
+    </h2>
+{% endif %}
\ No newline at end of file
diff --git a/app/Resources/views/brickset/reviews.html.twig b/app/Resources/views/brickset/reviews.html.twig
new file mode 100644
index 0000000..6b6a89d
--- /dev/null
+++ b/app/Resources/views/brickset/reviews.html.twig
@@ -0,0 +1,26 @@
+<div class="ui comments">
+    {% for review in reviews %}
+        <div class="comment">
+            <a class="avatar">
+                {#<img src="/images/avatar/small/matt.jpg">#}
+            </a>
+            <div class="content">
+                <div class="header">
+                    <h4>{{ review.title }}</h4>
+                </div>
+                <span class="author">{{ review.author }}</span> {{ review.hTML }}
+                <div class="metadata">
+                    <span class="date">{{ review.datePosted|date("Y.m.d H:m:i")}}</span>
+
+                </div>
+                <div class="text">
+                    {{ review.review|raw }}
+                </div>
+                <div>
+                    Overall rating <div class="ui star rating" data-rating="{{ review.overallRating }}" data-max-rating="5"></div>
+                    {#Value for money <div class="ui star rating" data-rating="{{ review.valueForMoney }}" data-max-rating="5"></div>#}
+                </div>
+            </div>
+        </div>
+    {% endfor %}
+</div>
\ No newline at end of file
diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig
index 918e8e0..4222685 100644
--- a/app/Resources/views/default/index.html.twig
+++ b/app/Resources/views/default/index.html.twig
@@ -1,6 +1,14 @@
 {% extends 'base.html.twig' %}
 
-{% block content %}
-
+{% block page %}
+    <div class="ui grid massive message vertical">
+        <div class="ui container">
+            <div class="row">
+                <div class="h1 ui huge header">
+                    Hello, world!
+                </div>
+            </div>
+        </div>
+    </div>
 {% endblock %}
 
diff --git a/app/Resources/views/error/error.html.twig b/app/Resources/views/error/error.html.twig
index b92b910..737f0ff 100644
--- a/app/Resources/views/error/error.html.twig
+++ b/app/Resources/views/error/error.html.twig
@@ -3,9 +3,9 @@
 {% block title %}{{ 'page.error.title'|trans }}{% endblock %}
 
 {% block content %}
-    <h2 class="ui center aligned icon header">
+    <h1 class="ui center aligned icon header">
         <i class="circular warning icon"></i>
         {{ 'page.error.large'|trans }}
-    </h2>
+    </h1>
     <p class="ui center aligned">{{ 'page.error.text'|trans }}</p>
 {% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/html.html.twig b/app/Resources/views/html.html.twig
new file mode 100644
index 0000000..0c017fd
--- /dev/null
+++ b/app/Resources/views/html.html.twig
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8" />
+    <title>{% block title %}PrintABrick{% endblock %}</title>
+    {% block stylesheets %}
+        <link rel="stylesheet" href="{{ asset('resources/css/main.css') }}">
+    {% endblock %}
+    <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
+</head>
+<body class="default-theme">
+{% block body %}
+    
+{% endblock %}
+
+{% block javascripts %}
+
+    <script type="text/javascript" src="{{ asset('resources/js/three.js') }}"></script>
+
+    <script type="text/javascript" src="{{ asset('resources/js/OrbitControls.js') }}"></script>
+
+    <script src="{{ asset('resources/js/main.js') }}"></script>
+{% endblock %}
+</body>
+</html>
diff --git a/app/Resources/views/ldraw/model/detail.html.twig b/app/Resources/views/ldraw/model/detail.html.twig
deleted file mode 100644
index 5495401..0000000
--- a/app/Resources/views/ldraw/model/detail.html.twig
+++ /dev/null
@@ -1,85 +0,0 @@
-{% extends 'base.html.twig' %}
-
-{% import 'macros/elements.html.twig' as elements %}
-
-{% block content %}
-    {% if model %}
-        <dl>
-            <dt>number:</dt><dd>{{ model.number }}</dd>
-            <dt>name:</dt><dd>{{ model.name }}</dd>
-            <dt>category:</dt><dd>{{ model.category ? model.category.name }}</dd>
-            <dt>type:</dt><dd>{{ model.type ? model.type.name }}</dd>
-            <dt>model:</dt><dd>{{ model.path }}</dd>
-            <dt>author:</dt><dd>{{ model.author }}</dd>
-            <dt>keywords:</dt>
-            <dd>
-                {% for keyword in model.keywords %}
-                    <span class="ui label">{{ keyword.name }}</span>
-                {% endfor %}
-            </dd>
-            <dt>aliases:</dt>
-            <dd>
-                {% for alias in model.aliases %}
-                    <span class="ui label">{{ alias.number }}</span>
-                {% endfor %}
-            </dd>
-            <dd>Download:</dd>
-            <dt><a href="{{ path('model_stl', {'number' : model.number })}}">{{ model.number }}</a></dt>
-            <dt>rebrickable parts ({{ rbParts|length }}):</dt>
-            <dd>
-                <p>
-                <div class="ui eight doubling cards">
-                    {% for alias in rbParts %}
-                        <a href="{{ url('rebrickable_part_show', {number:alias.number}) }}" class="ui label">{{ alias.number }}</a>
-                    {% endfor %}
-                </div>
-                </p>
-            </dd>
-
-        </dl>
-    {% endif %}
-
-    <div style="display: flex; flex-wrap: wrap">
-        <div id="model" style="height: 300px; width: 300px; padding: 5px; display: inline-block"></div>
-        <div style="height: 300px; width: 300px; padding: 5px; display: inline-block">
-            <img src="{{ url('model_image', {'number': model.number}) }}"  style="max-height: 90%; max-width: 100%">
-        </div>
-
-        <h4 class="ui horizontal divider header">
-            <i class="puzzle icon"></i> Subparts of this model
-        </h4>
-
-        {% for subpart in model.subparts  %}
-            {{ elements.part(subpart.subpart) }}
-        {% endfor %}
-
-        <h4 class="ui horizontal divider header">
-            <i class="cube icon"></i> Model is subpart of
-        </h4>
-
-        {% for subpart in model.parents  %}
-            {{ elements.part(subpart.parent) }}
-        {% endfor %}
-
-        <h4 class="ui horizontal divider header">
-            <i class="cubes icon"></i> Sets ({{ sets|length }})
-        </h4>
-
-        {% for set in sets %}
-            <span style="margin: 5px"><a href="{{ url('set_detail', {number:set.number}) }}">{{ set.number }}</a></span>
-        {% endfor %}
-    </div>
-{% endblock %}
-
-{% block javascripts %}
-    {{ parent() }}
-
-    <script type="text/javascript">
-        window.onload = function() {
-            modelView = new ModelViewer();
-            var scene = modelView.initScene($('#model'));
-            modelView.loadStl('{{ path('model_stl', {'number' : model.number })}}');
-            modelView.render();
-        };
-    </script>
-{% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/macros/elements.html.twig b/app/Resources/views/macros/elements.html.twig
index b6df6ff..9b9c149 100644
--- a/app/Resources/views/macros/elements.html.twig
+++ b/app/Resources/views/macros/elements.html.twig
@@ -1,7 +1,13 @@
 {% macro part(model) %}
-    <div style="height: 100px; width: 100px; padding: 5px; display: inline-block;">
-        <img src="{{ url('model_image', {'number': model.number }) }}" style="max-height: 90%; max-width: 100%;">
-        <p><a href="{{ url('model_detail', {'number': model.number}) }}">{{ model.number }}</a></p>
+    <div class="column">
+        <div class="ui bordered fluid image">
+            <a href="{{ url('model_detail', {'number': model.number})}}">
+                <div class="image">
+                    <img src="{{ asset('/ldraw/images/'~model.number~'.png') | imagine_filter('model_min') }}" data-src="{{ asset('/ldraw/images/'~model.number~'.png') | imagine_filter('model_min') }}" class="transition visible">
+                </div>
+                <div class="ui bottom attached label {%  if model.parts|length == 0 %}black{% endif %}">{{ model.number }}</div>
+            </a>
+        </div>
     </div>
 {% endmacro %}
 
diff --git a/app/Resources/views/macros/utils.html.twig b/app/Resources/views/macros/utils.html.twig
new file mode 100644
index 0000000..36850dd
--- /dev/null
+++ b/app/Resources/views/macros/utils.html.twig
@@ -0,0 +1,21 @@
+{#http://stackoverflow.com/a/15303004#}
+{% macro bytesToSize(bytes) %}
+    {% spaceless %}
+        {% set kilobyte = 1024 %}
+        {% set megabyte = kilobyte * 1024 %}
+        {% set gigabyte = megabyte * 1024 %}
+        {% set terabyte = gigabyte * 1024 %}
+
+        {% if bytes < kilobyte %}
+            {{ bytes ~ ' B' }}
+        {% elseif bytes < megabyte %}
+            {{ (bytes / kilobyte)|number_format(2, '.') ~ ' KB' }}
+        {% elseif bytes < gigabyte %}
+            {{ (bytes / megabyte)|number_format(2, '.') ~ ' MB' }}
+        {% elseif bytes < terabyte %}
+            {{ (bytes / gigabyte)|number_format(2, '.') ~ ' GB' }}
+        {% else %}
+            {{ (bytes / terabyte)|number_format(2, '.') ~ ' TB' }}
+        {% endif %}
+    {% endspaceless %}
+{% endmacro %}
\ No newline at end of file
diff --git a/app/Resources/views/model/detail.html.twig b/app/Resources/views/model/detail.html.twig
new file mode 100644
index 0000000..a4ea0ac
--- /dev/null
+++ b/app/Resources/views/model/detail.html.twig
@@ -0,0 +1,122 @@
+{% extends 'base.html.twig' %}
+
+{% import 'macros/elements.html.twig' as elements %}
+
+{% block title %}#{{ model.number }} - {{ model.name }}{% endblock %}
+
+{% block header %}#{{ model.number }} - {{ model.name }}{% endblock %}
+
+{% block content %}
+
+    <div class="ui grid">
+        <div class="column ten wide">
+            <div id="model-viewer" class="model-container">
+                <img src="{{ asset('ldraw/images/'~model.number~'.png') | imagine_filter('model_large')}}">
+            </div>
+        </div>
+        <div class="column six wide">
+            <div class="grey">
+                <table>
+                    <tr>
+                        <th>category</th><td>{{ model.category ? model.category.name }}</td>
+                    </tr>
+                    <tr>
+                        <th>model</th><td>{{ model.path }}</td>
+                    </tr>
+                    <tr>
+                        <th>author</th><td>{{ model.author.name }}</td>
+                    </tr>
+                </table>
+
+                <dl>
+                    <dt>keywords:</dt>
+                    <dd>
+                        {% for keyword in model.keywords %}
+                            <span class="ui label">{{ keyword.name }}</span>
+                        {% endfor %}
+                    </dd>
+                    <dt>aliases:</dt>
+                    <dd>
+                        {% for alias in model.aliases %}
+                            <span>{{ alias.number }}</span>{%  if not loop.last %},{% endif %}
+                        {% endfor %}
+                    </dd>
+                    <dd>Download:</dd>
+                    <dt><a href="{{ url('media_file', {'path': model.path}) }}">{{ model.number }}</a></dt>
+                    <dt>rebrickable parts ({{ rbParts|length }}):</dt>
+                    <dd>
+                        {#<p>#}
+                        {#<div class="ui eight doubling cards">#}
+                        {#{% for alias in rbParts %}#}
+                        {#<a href="{{ url('reb_part_detail', {number:alias.number}) }}" class="ui label">{{ alias.number }}</a>#}
+                        {#{% endfor %}#}
+                        {#</div>#}
+                        {#</p>#}
+                    </dd>
+                </dl>
+            </div>
+        </div>
+    </div>
+
+
+    <h4 class="ui horizontal divider header">
+        Related Models
+    </h4>
+
+
+    <h5 class="ui horizontal divider header">
+        Subparts of this model
+    </h5>
+
+    <div class="ui eight column grid">
+        {% for subpart in model.subparts  %}
+            <div class="column">
+                {{ elements.part(subpart.subpart) }}
+            </div>
+        {% endfor %}
+    </div>
+
+    <h5 class="ui horizontal divider header">
+        Model is subpart of
+    </h5>
+
+    <div class="ui eight column grid">
+        {% for subpart in model.parents  %}
+            <div class="column">
+                {{ elements.part(subpart.parent) }}
+            </div>
+        {% endfor %}
+    </div>
+
+    <h5 class="ui horizontal divider header">
+        Model pairs with
+    </h5>
+
+    <div class="ui eight column grid">
+        {% for subpart in related  %}
+            <div class="column">
+                {{ elements.part(subpart) }}
+            </div>
+        {% endfor %}
+    </div>
+
+    <h4 class="ui horizontal divider header">
+        <i class="cubes icon"></i> Sets ({{ sets|length }})
+    </h4>
+
+    {% for set in sets %}
+        <span style="margin: 5px"><a href="{{ url('set_detail', {number:set.number}) }}">{{ set.number }}</a></span>
+    {% endfor %}
+
+
+
+{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+    <script type="text/javascript">
+        window.onload = function() {
+            modelView = new ModelViewer($('#model-viewer'), '{{ url('media_file', {'path': model.path }) }}');
+        };
+    </script>
+{% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/ldraw/model/index.html.twig b/app/Resources/views/model/index.html.twig
similarity index 54%
rename from app/Resources/views/ldraw/model/index.html.twig
rename to app/Resources/views/model/index.html.twig
index 0bc5989..f175824 100644
--- a/app/Resources/views/ldraw/model/index.html.twig
+++ b/app/Resources/views/model/index.html.twig
@@ -2,8 +2,14 @@
 
 {% import 'macros/elements.html.twig' as elements %}
 
+{% block title %}{{ 'page.model.index' | trans }}{% endblock %}
+
+{% block header %}{{ 'page.model.index' | trans }}{% endblock %}
+
 {% block content %}
-    <form method="get" action="." class="ui form">
+<div class="ui container stackable grid">
+    <div class="column four wide">
+    <form method="get" action="" class="ui form">
         {{ form_start(form) }}
 
         {{ form_row(form.search) }}
@@ -16,18 +22,17 @@
         </div>
         {{ form_end(form) }}
     </form>
-
-
+    </div>
+    <div class="column twelve wide">
+        {{ knp_pagination_render(models) }}
     <p>{{ models.getTotalItemCount }}</p>
-    <div class="ui ten column grid">
-        <div class="row">
-            {% for model in models %}
-                <div class="column">
-                    {{ elements.part(model) }}
-                </div>
-            {% endfor %}
-        </div>
+    <div class="ui eight column grid">
+        {% for model in models %}
+            {{ elements.part(model) }}
+        {% endfor %}
     </div>
 
     {{ knp_pagination_render(models) }}
+    </div>
+</div>
 {% endblock %}
diff --git a/app/Resources/views/rebrickable/color/index.html.twig b/app/Resources/views/rebrickable/color/index.html.twig
index e06398d..560f9f1 100644
--- a/app/Resources/views/rebrickable/color/index.html.twig
+++ b/app/Resources/views/rebrickable/color/index.html.twig
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-    <table class="ui celled padded table">
+    <table class="ui celled small padded table">
         <thead>
         <tr>
             <th></th>
diff --git a/app/Resources/views/rebrickable/part/detail.html.twig b/app/Resources/views/rebrickable/part/detail.html.twig
index 050fdff..31a2e4a 100644
--- a/app/Resources/views/rebrickable/part/detail.html.twig
+++ b/app/Resources/views/rebrickable/part/detail.html.twig
@@ -9,28 +9,33 @@
         <dt>category:</dt><dd>{{ part.category ? part.category.name }}</dd>
     </dl>
 
-    <div style="display: flex; flex-wrap: wrap">
-        {% if apiPart is not null %}
-            <div style="height: 300px; width: 300px; padding: 5px; display: inline-block">
-                <img src="{{ apiPart.imgUrl }}"  style="max-height: 90%; max-width: 100%">
-            </div>
-        {% endif %}
-        <div style="height: 300px; width: 300px; padding: 5px; display: inline-block">
-            <img src="{{ url('model_image', {number:part.number}) }}"  style="max-height: 90%; max-width: 100%">
-        </div>
 
-        {% if part.model %}
-            {{ elements.part(part.model) }}
-        {% endif %}
-    </div>
+    {% if apiPart is not null %}
+        <a href="{{ apiPart.url }}">Rebrickable</a>
+
+        <img class="image ui middle" src="{{ apiPart.imgUrl }}"  style="max-height: 90%; max-width: 100%">
+    {% endif %}
+
+    {% if part.model %}
+        {{ elements.part(part.model) }}
+    {% endif %}
 
     <h4 class="ui horizontal divider header">
         <i class="puzzle icon"></i> Sets
     </h4>
 
+    <div class="ui eight column grid">
     {% for set in sets %}
-        <span style="margin: 5px"><a href="{{ url('set_detail', {number:set.number}) }}">{{ set.number }}</a></span>
+        <div class="column">
+            <div class="ui fluid bordered image">
+                <a href="{{ url('set_detail', {number:set.number}) }}">
+                    <img class="ui bordered image" src="{{ set.number|setImage|imagine_filter('rebrickable_set_min') }}">
+                    <div class="ui bottom attached label">{{ set.number }}<br></div>
+                </a>
+            </div>
+        </div>
     {% endfor %}
+    <div>
 
     {{ dump(apiPart) }}
 
diff --git a/app/Resources/views/rebrickable/part/index.html.twig b/app/Resources/views/rebrickable/part/index.html.twig
new file mode 100644
index 0000000..9b5a206
--- /dev/null
+++ b/app/Resources/views/rebrickable/part/index.html.twig
@@ -0,0 +1,25 @@
+{% extends 'base.html.twig' %}
+
+{% block content %}
+
+    <div class="ui seven column grid">
+        <div class="row">
+            {% for part in parts %}
+                <div class="column">
+                    <div class="ui fluid bordered image">
+                        <a href="{{ path('reb_part_detail', {number: part.number}) }}">
+                            <div class="image load">
+                                <img src="{{ part.number|partImage(-1)| imagine_filter('rebrickable_part_min') }}" data-src="{{ part.number|partImage(-1)| imagine_filter('rebrickable_part_min') }}" class="transition visible">
+                            </div>
+                            <div class="ui bottom attached label {{ part.model == null ? 'black' : 'red'}}">{{ part.number }}</div>
+                        </a>
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+
+    <p>{{ parts.getTotalItemCount }}</p>
+
+    {{ knp_pagination_render(parts) }}
+{% endblock %}
diff --git a/app/Resources/views/rebrickable/set/detail.html.twig b/app/Resources/views/rebrickable/set/detail.html.twig
deleted file mode 100644
index 153eea9..0000000
--- a/app/Resources/views/rebrickable/set/detail.html.twig
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends 'base.html.twig' %}
-
-{% block content %}
-    {% if set is not null %}
-        <dl>
-            <dt>number:</dt><dd>{{ set.number }}</dd>
-            <dt>year:</dt><dd>{{ set.year }}</dd>
-            <dt>name:</dt><dd>{{ set.name }}</dd>
-            <dt>theme:</dt><dd>{{ set.theme.name }}</dd>
-            <dt>count of parts:</dt><dd>{{ set.partCount }}</dd>
-        </dl>
-
-        <img class="ui bordered image medium" src="{{ rbset ?  rbset.imgUrl }}">
-
-
-        <h4 class="ui horizontal divider header">
-            <i class="cubes icon"></i> Parts {{ inventoryParts|length }}
-        </h4>
-
-        <div class="ui eight column grid">
-        {% for inventoryPart in inventoryParts %}
-            <div class="column">
-                <div class="ui fluid image {{ inventoryPart.part.model == null ? 'active dimmer'}}" style="height: 150px;">
-                    <a class="ui right red circular label">{{ inventoryPart.quantity }}</a>
-                    <a href="{{ path('rebrickable_part_show', {number: inventoryPart.part.number}) }}">
-                        <img src="https://rebrickable.com/media/parts/ldraw/{{inventoryPart.color ? inventoryPart.color.id  }}/{{ inventoryPart.part.number }}.png">
-                        <div style="border-bottom: #{{ inventoryPart.color.rgb }} 5px solid" class="ui bottom attached label">{{ inventoryPart.part.number }}<br>{{ inventoryPart.isSpare ? 'Spare' : 'Regular' }}</div>
-                    </a>
-                </div>
-            </div>
-        {% endfor %}
-        <div>
-
-
-        <h4 class="ui horizontal divider header">
-            <i class="cubes icon"></i> Models {{ parts|length }}
-        </h4>
-
-        <div class="ui eight column grid">
-        {% for part in parts %}
-            <div class="column">
-                <div class="ui bordered fluid image">
-                    <a href="{{ path('model_detail', {number: part.number}) }}">
-                        <img src="https://rebrickable.com/media/parts/ldraw/-1/{{ part.number }}.png">
-                        <div class="ui bottom attached label">{{ part.number }} </div>
-                    </a>
-                </div>
-            </div>
-        {% endfor %}
-        <div>
-
-
-    {% endif %}
-
-    {{ brset ? dump(brset) }}
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/rebrickable/set/index.html.twig b/app/Resources/views/rebrickable/set/index.html.twig
deleted file mode 100644
index 16375e3..0000000
--- a/app/Resources/views/rebrickable/set/index.html.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends 'base.html.twig' %}
-
-{% block content %}
-    <div class="ui seven column grid">
-        <div class="row">
-            {% for set in sets %}
-                <div class="column">
-                   <a href="{{ url('set_detail', {'number': set.number, 'name' : set.name|escape('url') }) }}">
-
-                       {#<img style="width: 100%" src="{{ set }}">#}
-                       <p>{{ set.number }} - {{ set.name }}</p>
-                   </a>
-                </div>
-            {% endfor %}
-        </div>
-    </div>
-
-    <p>{{ sets.getTotalItemCount }}</p>
-
-    {{ knp_pagination_render(sets) }}
-{% endblock %}
diff --git a/app/Resources/views/rebrickable/set/parts.html.twig b/app/Resources/views/rebrickable/set/parts.html.twig
new file mode 100644
index 0000000..90b6c2a
--- /dev/null
+++ b/app/Resources/views/rebrickable/set/parts.html.twig
@@ -0,0 +1,46 @@
+{% if regularParts|length > 0 %}
+<h4 class="ui horizontal divider header">
+    Regular parts
+</h4>
+
+<div class="ui ten column grid">
+    {% for inventoryPart in regularParts %}
+        {% if inventoryPart.part is defined %}
+            <div class="column">
+                <div class="ui fluid bordered image">
+                    <a class="ui right {{ inventoryPart.part.model == null ? 'black' : 'red'}} circular label">{{ inventoryPart.quantity }}</a>
+                    <a href="{{ path('reb_part_detail', {number: inventoryPart.part.number}) }}">
+                        <div class="image load">
+                            <img src="{{ inventoryPart.part.number|partImage(inventoryPart.color.id)| imagine_filter('rebrickable_part_min') }}" data-src="{{ inventoryPart.part.number|partImage(inventoryPart.color.id)| imagine_filter('rebrickable_part_min') }}" class="transition visible">
+                        </div>
+                        <div style="border-bottom: #{{ inventoryPart.color.rgb }} 5px solid" class="ui bottom attached label">{{ inventoryPart.part.number }}</div>
+                    </a>
+                </div>
+            </div>
+        {% endif %}
+    {% endfor %}
+</div>
+{% endif %}
+
+{% if spareParts|length > 0 %}
+<h4 class="ui horizontal divider header">
+    Spare parts
+</h4>
+<div class="ui ten column grid">
+    {% for inventoryPart in spareParts %}
+        {% if inventoryPart.part is defined %}
+            <div class="column">
+                <div class="ui fluid bordered image">
+                    <a class="ui right {{ inventoryPart.part.model == null ? 'black' : 'red'}} circular label">{{ inventoryPart.quantity }}</a>
+                    <a href="{{ path('reb_part_detail', {number: inventoryPart.part.number}) }}">
+                        <div class="image load">
+                            <img src="{{ inventoryPart.part.number|partImage(inventoryPart.color.id)| imagine_filter('rebrickable_part_min') }}" data-src="{{ inventoryPart.part.number|partImage(inventoryPart.color.id)| imagine_filter('rebrickable_part_min') }}" class="transition visible">
+                        </div>
+                        <div style="border-bottom: #{{ inventoryPart.color.rgb }} 5px solid" class="ui bottom attached label">{{ inventoryPart.part.number }}</div>
+                    </a>
+                </div>
+            </div>
+        {% endif %}
+    {% endfor %}
+</div>
+{% endif %}
diff --git a/app/Resources/views/rebrickable/set/sets.html.twig b/app/Resources/views/rebrickable/set/sets.html.twig
new file mode 100644
index 0000000..593b934
--- /dev/null
+++ b/app/Resources/views/rebrickable/set/sets.html.twig
@@ -0,0 +1,16 @@
+<h4 class="ui horizontal divider header">Sets</h4>
+<div class="ui seven column grid">
+    <div class="row">
+        {% for set in inventorySets %}
+            <div class="column">
+                <a href="{{ url('set_detail', {'number': set.set.number}) }}">
+                    <div class="ui bordered image medium">
+                        <img src="{{ asset('resources/images/unknown_image.png') }}" data-src="{{ set.set.number|setImage|imagine_filter('rebrickable_set_min') }}" class="transition visible">
+                    </div>
+                    <p>{{ set.set.number }} - {{ set.set.name }}</p>
+                    <p>{{ set.quantity}}</p>
+                </a>
+            </div>
+        {% endfor %}
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Resources/views/set/detail.html.twig b/app/Resources/views/set/detail.html.twig
new file mode 100644
index 0000000..6b93a16
--- /dev/null
+++ b/app/Resources/views/set/detail.html.twig
@@ -0,0 +1,138 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}{{ rbset ? rbset.number }}  {{ rbset ? rbset.name }}{% endblock %}
+
+{% block header %}{{ rbset ? rbset.number }}  {{ rbset ? rbset.name }}{% endblock %}
+
+{% block content %}
+
+    <div class="ui stackable grid">
+        <div class="column nine wide">
+            <div class="image bordered ui big">
+                {% if brset %}
+                    <img class="big" src="{{ brset.imageURL }}">
+                {% elseif rbset %}
+                    <img class="big" src="{{ rbset.number|setImage|imagine_filter('rebrickable') }}">
+                {% endif %}
+            </div>
+        </div>
+        <div class="column seven wide">
+            <div class="item-info black ui">
+                <table class="ui table">
+                    <tr>
+                        <td>number</td><td>{{ brset ? brset.legoSetID :  rbset ? rbset.number : null}}</td>
+                    </tr>
+                    <tr>
+                        <td>name</td><td>{{ brset ? brset.name :  rbset ? rbset.name : null}}</td>
+                    </tr>
+                    <tr>
+                        <td>year</td><td>{{ brset ? brset.year :  rbset ? rbset.year : null}}</td>
+                    </tr>
+                    <tr>
+                        <td>theme</td>
+                        {% if rbset %}
+                            <td><a href="#">{{ rbset.theme.parent ? rbset.theme.parent.name }}</a>  <a href="#">{{ rbset.theme.name }}</a> </td>
+                        {% elseif brset %}
+                            <td>{{ brset.theme }}</td>
+                        {% endif %}
+                    </tr>
+                    <tr>
+                        <td>parts</td><td>{{ brset ? brset.pieces : rbset ? rbset.partCount }}</td>
+                    </tr>
+                    {% if brset %}
+                        <tr>
+                            <td></td>
+                            <td><a class="brickset link" href="{{ brset.bricksetURL }}">Brickset</a></td>
+                        </tr>
+                    {% endif %}
+                    {% if rbset %}
+                        <tr>
+                            <td></td>
+                            <td><a class="rebrickable link" href="http://rebrickable.com/sets/{{ rbset ? rbset.number }}">Rebrickable</a></td>
+                        </tr>
+                    {% endif %}
+                </table>
+
+                {% if brset is not null %}
+                    <dl>
+                        <dt>themegroup:</dt><dd>{{ brset.themeGroup }}</dd>
+                        <dt>theme:</dt><dd>{{ brset.theme }}</dd>
+                        <dt>subtheme:</dt><dd>{{ brset.subtheme }}</dd>
+                        <dt>count of parts:</dt><dd>{{ brset.pieces }}</dd>
+                        <dt>minifigs:</dt><dd>{{ brset.minifigs }}</dd>
+                    </dl>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+    <div class="segment vertical item-info">
+        <div class="ui tabular menu">
+            <a class="item active" data-tab="parts"><i class="cubes icon"></i> Parts ({{ rbset ? rbset.partCount : 0}})</a>
+            {% if brset %}
+                <a class="item" data-tab="description"><i class="info icon"></i> Description</a>
+                <a class="item" data-tab="images"> <i class="image icon"></i> Images ({{ brset.additionalImageCount }})</a>
+                <a class="item" data-tab="instructions"> <i class="file pdf outline icon"></i> Instructions ({{ brset.instructionsCount }})</a>
+                <a class="item" data-tab="reviews"><i class="write icon"></i> Reviews ({{ brset.reviewCount }})</a>
+            {% endif %}
+        </div>
+        <div class="ui tab active" data-tab="parts">
+            {% if rbset %}
+
+                <div class="ajax-load" id="parts" data-src="{{ path('rebrickable_set_parts', { 'number': rbset.number }) }}"></div>
+
+                {#{{ render(controller('AppBundle:Rebrickable/Set:parts', { 'number': rbset.number })) }}#}
+
+            {% endif %}
+        </div>
+        {% if brset %}
+            <div class="ui tab" data-tab="images">
+                {#<div class="ajax-load" id="images" data-src="{{ path('brickset_images', { 'id': brset.setID }) }}"></div>#}
+
+                {{ render(controller('AppBundle:Brickset/Set:images', { 'id': brset.setID })) }}
+            </div>
+            <div class="ui tab" data-tab="instructions">
+                {#<div class="ajax-load" id="instructions" data-src="{{ path('brickset_instructions', { 'id': brset.setID }) }}"></div>#}
+
+                {{ render(controller('AppBundle:Brickset/Set:instructions', { 'id': brset.setID })) }}
+            </div>
+            <div class="ui tab" data-tab="reviews">
+                {#<div class="ajax-load" id="reviews" data-src="{{ path('brickset_reviews', { 'id': brset.setID }) }}"></div>#}
+
+                {{ render(controller('AppBundle:Brickset/Set:reviews', { 'id': brset.setID })) }}
+            </div>
+            <div class="ui tab" data-tab="description">
+                {{ brset.description }}
+            </div>
+        {% endif %}
+    </div>
+
+
+{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+
+    <script type="text/javascript">
+
+        $(document).ready(function () {
+
+            $('.ajax-load').each(function () {
+                $self = $(this);
+
+                console.log($self);
+                $.ajax({
+                    type: "POST",
+                    dataType: 'json',
+                    url: $self.data('src'),
+                    async: true, //you won't need that if nothing in your following code is dependend of the result
+                    success: function(response){
+                        $self.html(response); //Change the html of the div with the id = "your_div"
+                    }
+                })
+            })
+
+        })
+
+    </script>
+{% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/set/index.html.twig b/app/Resources/views/set/index.html.twig
new file mode 100644
index 0000000..96d3aa1
--- /dev/null
+++ b/app/Resources/views/set/index.html.twig
@@ -0,0 +1,36 @@
+{% extends 'base.html.twig' %}
+
+{% block content %}
+
+    <form method="get" action="" class="ui form">
+        {{ form_start(form) }}
+
+        {{ form_row(form.search) }}
+        <div class="field fluid search selection">
+            {{ form_label(form.theme.id) }}
+            {{ form_widget(form.theme.id) }}
+        </div>
+        <div class="field">
+            <input class="ui submit button" type="submit" value="filter"/>
+        </div>
+        {{ form_rest(form) }}
+        {{ form_end(form) }}
+    </form>
+
+    <div class="ui seven column grid">
+        <div class="row">
+            {% for set in sets %}
+                <div class="column">
+                   <a href="{{ url('set_detail', {'number': set.number, 'name' : set.name|escape('url') }) }}">
+                       <img class="ui bordered image medium" src="{{ set.number|setImage|imagine_filter('rebrickable_set_min') }}">
+                       <p>{{ set.number }} - {{ set.name }}</p>
+                   </a>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+
+    <p>{{ sets.getTotalItemCount }}</p>
+
+    {{ knp_pagination_render(sets) }}
+{% endblock %}
diff --git a/app/autoload.php b/app/autoload.php
index 31321fa..c92a7cc 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -1,7 +1,7 @@
 <?php
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /** @var ClassLoader $loader */
 $loader = require __DIR__.'/../vendor/autoload.php';
diff --git a/app/config/brickset.xml b/app/config/brickset.xml
new file mode 100644
index 0000000..f2629a8
--- /dev/null
+++ b/app/config/brickset.xml
@@ -0,0 +1,2564 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="https://brickset.com/api/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" targetNamespace="https://brickset.com/api/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <s:schema elementFormDefault="qualified" targetNamespace="https://brickset.com/api/">
+      <s:element name="getSets">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="query" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="theme" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="subtheme" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="setNumber" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="year" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="owned" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="wanted" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="orderBy" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="pageSize" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="pageNumber" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userName" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getSetsResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getSetsResult" type="tns:ArrayOfSets" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfSets">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="sets" nillable="true" type="tns:sets" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="sets">
+        <s:sequence>
+          <s:element minOccurs="1" maxOccurs="1" name="setID" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="number" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="numberVariant" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="name" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="year" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="theme" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="themeGroup" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="subtheme" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="pieces" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="minifigs" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="image" type="s:boolean" />
+          <s:element minOccurs="0" maxOccurs="1" name="imageFilename" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="thumbnailURL" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="largeThumbnailURL" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="imageURL" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="bricksetURL" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="released" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="owned" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="wanted" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="qtyOwned" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="userNotes" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="ACMDataCount" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="ownedByTotal" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="wantedByTotal" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="UKRetailPrice" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="USRetailPrice" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="CARetailPrice" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="EURetailPrice" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="USDateAddedToSAH" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="USDateRemovedFromSAH" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="rating" type="s:decimal" />
+          <s:element minOccurs="1" maxOccurs="1" name="reviewCount" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="packagingType" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="availability" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="instructionsCount" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="additionalImageCount" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="EAN" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="UPC" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="description" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="lastUpdated" type="s:dateTime" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="getSet">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="SetID" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getSetResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getSetResult" type="tns:ArrayOfSets" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getRecentlyUpdatedSets">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="minutesAgo" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getRecentlyUpdatedSetsResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getRecentlyUpdatedSetsResult" type="tns:ArrayOfSets" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getAdditionalImages">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="setID" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getAdditionalImagesResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getAdditionalImagesResult" type="tns:ArrayOfAdditionalImages" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfAdditionalImages">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="additionalImages" nillable="true" type="tns:additionalImages" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="additionalImages">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="thumbnailURL" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="largeThumbnailURL" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="imageURL" type="s:string" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="getReviews">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="setID" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getReviewsResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getReviewsResult" type="tns:ArrayOfReviews" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfReviews">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="reviews" nillable="true" type="tns:reviews" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="reviews">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="author" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="datePosted" type="s:dateTime" />
+          <s:element minOccurs="1" maxOccurs="1" name="overallRating" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="parts" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="buildingExperience" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="playability" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="valueForMoney" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="title" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="review" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="HTML" type="s:boolean" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="getInstructions">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="setID" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getInstructionsResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getInstructionsResult" type="tns:ArrayOfInstructions" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfInstructions">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="instructions" nillable="true" type="tns:instructions" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="instructions">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="URL" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="description" type="s:string" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="getMinifigCollection">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="query" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="owned" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="wanted" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getMinifigCollectionResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getMinifigCollectionResult" type="tns:ArrayOfMinifigCollection" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfMinifigCollection">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="minifigCollection" nillable="true" type="tns:minifigCollection" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="minifigCollection">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="minifigNumber" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="ownedInSets" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="ownedLoose" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="ownedTotal" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="wanted" type="s:boolean" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="getThemes">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getThemesResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getThemesResult" type="tns:ArrayOfThemes" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfThemes">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="themes" nillable="true" type="tns:themes" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="themes">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="theme" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="setCount" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="subthemeCount" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="yearFrom" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="yearTo" type="s:int" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="getSubthemes">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="theme" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getSubthemesResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getSubthemesResult" type="tns:ArrayOfSubthemes" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfSubthemes">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="subthemes" nillable="true" type="tns:subthemes" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="subthemes">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="theme" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="subtheme" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="setCount" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="yearFrom" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="yearTo" type="s:int" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="getYears">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="theme" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getYearsResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getYearsResult" type="tns:ArrayOfYears" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfYears">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="years" nillable="true" type="tns:years" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="years">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="theme" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="year" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="setCount" type="s:int" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="getThemesForUser">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="owned" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="wanted" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getThemesForUserResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getThemesForUserResult" type="tns:ArrayOfThemes" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getSubthemesForUser">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="theme" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="owned" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="wanted" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getSubthemesForUserResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getSubthemesForUserResult" type="tns:ArrayOfSubthemes" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getYearsForUser">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="theme" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="owned" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="wanted" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getYearsForUserResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getYearsForUserResult" type="tns:ArrayOfYears" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getUserNotes">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getUserNotesResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getUserNotesResult" type="tns:ArrayOfUserNotes" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfUserNotes">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="userNotes" nillable="true" type="tns:userNotes" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="userNotes">
+        <s:sequence>
+          <s:element minOccurs="1" maxOccurs="1" name="setID" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="userNotes" type="s:string" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="getCollectionTotals">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getCollectionTotalsResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getCollectionTotalsResult" type="tns:collectionTotals" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="collectionTotals">
+        <s:sequence>
+          <s:element minOccurs="1" maxOccurs="1" name="totalSetsOwned" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="totalDistinctSetsOwned" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="totalSetsWanted" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="totalMinifigsOwned" type="s:int" />
+          <s:element minOccurs="1" maxOccurs="1" name="totalMinifigsWanted" type="s:int" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="setCollection">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="setID" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="qtyOwned" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="wanted" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setCollectionResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="setCollectionResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setCollection_owns">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="setID" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="owned" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setCollection_ownsResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="setCollection_ownsResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setCollection_wants">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="setID" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="wanted" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setCollection_wantsResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="setCollection_wantsResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setCollection_userNotes">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="setID" type="s:int" />
+            <s:element minOccurs="0" maxOccurs="1" name="notes" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setCollection_userNotesResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="setCollection_userNotesResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setCollection_qtyOwned">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="setID" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="qtyOwned" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setCollection_qtyOwnedResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="setCollection_qtyOwnedResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setMinifigCollection">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="minifigNumber" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="qtyOwned" type="s:int" />
+            <s:element minOccurs="1" maxOccurs="1" name="wanted" type="s:int" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setMinifigCollectionResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="setMinifigCollectionResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="login">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="username" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="password" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="loginResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="loginResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setCollectionDetail">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="detail" type="tns:collectionDetails" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="collectionDetails">
+        <s:sequence>
+          <s:element minOccurs="1" maxOccurs="1" name="collectionID" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="dateAcquired" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="currency" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="pricePaid" type="s:decimal" />
+          <s:element minOccurs="1" maxOccurs="1" name="additionalPricePaid" type="s:decimal" />
+          <s:element minOccurs="1" maxOccurs="1" name="currentEstimatedValue" type="s:decimal" />
+          <s:element minOccurs="0" maxOccurs="1" name="conditionWhenAcquired" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="acquiredFrom" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="conditionNow" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="location" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="notes" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="parts" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="minifigs" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="instructions" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="box" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="willTrade" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="modified" type="s:boolean" />
+          <s:element minOccurs="1" maxOccurs="1" name="deleted" type="s:boolean" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="setCollectionDetailResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="setCollectionDetailResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getCollectionDetail">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="SetID" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getCollectionDetailResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getCollectionDetailResult" type="tns:ArrayOfCollectionDetails" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfCollectionDetails">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="collectionDetails" nillable="true" type="tns:collectionDetails" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="getCollectionDetailConditions">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="which" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getCollectionDetailConditionsResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getCollectionDetailConditionsResult" type="tns:ArrayOfConditions" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ArrayOfConditions">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="unbounded" name="conditions" nillable="true" type="tns:conditions" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="conditions">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="condition" type="s:string" />
+        </s:sequence>
+      </s:complexType>
+      <s:element name="checkKey">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="apiKey" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="checkKeyResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="checkKeyResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="checkUserHash">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="userHash" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="checkUserHashResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="checkUserHashResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="ArrayOfSets" nillable="true" type="tns:ArrayOfSets" />
+      <s:element name="ArrayOfAdditionalImages" nillable="true" type="tns:ArrayOfAdditionalImages" />
+      <s:element name="ArrayOfReviews" nillable="true" type="tns:ArrayOfReviews" />
+      <s:element name="ArrayOfInstructions" nillable="true" type="tns:ArrayOfInstructions" />
+      <s:element name="ArrayOfMinifigCollection" nillable="true" type="tns:ArrayOfMinifigCollection" />
+      <s:element name="ArrayOfThemes" nillable="true" type="tns:ArrayOfThemes" />
+      <s:element name="ArrayOfSubthemes" nillable="true" type="tns:ArrayOfSubthemes" />
+      <s:element name="ArrayOfYears" nillable="true" type="tns:ArrayOfYears" />
+      <s:element name="ArrayOfUserNotes" nillable="true" type="tns:ArrayOfUserNotes" />
+      <s:element name="collectionTotals" nillable="true" type="tns:collectionTotals" />
+      <s:element name="string" nillable="true" type="s:string" />
+      <s:element name="ArrayOfCollectionDetails" nillable="true" type="tns:ArrayOfCollectionDetails" />
+      <s:element name="ArrayOfConditions" nillable="true" type="tns:ArrayOfConditions" />
+    </s:schema>
+  </wsdl:types>
+  <wsdl:message name="getSetsSoapIn">
+    <wsdl:part name="parameters" element="tns:getSets" />
+  </wsdl:message>
+  <wsdl:message name="getSetsSoapOut">
+    <wsdl:part name="parameters" element="tns:getSetsResponse" />
+  </wsdl:message>
+  <wsdl:message name="getSetSoapIn">
+    <wsdl:part name="parameters" element="tns:getSet" />
+  </wsdl:message>
+  <wsdl:message name="getSetSoapOut">
+    <wsdl:part name="parameters" element="tns:getSetResponse" />
+  </wsdl:message>
+  <wsdl:message name="getRecentlyUpdatedSetsSoapIn">
+    <wsdl:part name="parameters" element="tns:getRecentlyUpdatedSets" />
+  </wsdl:message>
+  <wsdl:message name="getRecentlyUpdatedSetsSoapOut">
+    <wsdl:part name="parameters" element="tns:getRecentlyUpdatedSetsResponse" />
+  </wsdl:message>
+  <wsdl:message name="getAdditionalImagesSoapIn">
+    <wsdl:part name="parameters" element="tns:getAdditionalImages" />
+  </wsdl:message>
+  <wsdl:message name="getAdditionalImagesSoapOut">
+    <wsdl:part name="parameters" element="tns:getAdditionalImagesResponse" />
+  </wsdl:message>
+  <wsdl:message name="getReviewsSoapIn">
+    <wsdl:part name="parameters" element="tns:getReviews" />
+  </wsdl:message>
+  <wsdl:message name="getReviewsSoapOut">
+    <wsdl:part name="parameters" element="tns:getReviewsResponse" />
+  </wsdl:message>
+  <wsdl:message name="getInstructionsSoapIn">
+    <wsdl:part name="parameters" element="tns:getInstructions" />
+  </wsdl:message>
+  <wsdl:message name="getInstructionsSoapOut">
+    <wsdl:part name="parameters" element="tns:getInstructionsResponse" />
+  </wsdl:message>
+  <wsdl:message name="getMinifigCollectionSoapIn">
+    <wsdl:part name="parameters" element="tns:getMinifigCollection" />
+  </wsdl:message>
+  <wsdl:message name="getMinifigCollectionSoapOut">
+    <wsdl:part name="parameters" element="tns:getMinifigCollectionResponse" />
+  </wsdl:message>
+  <wsdl:message name="getThemesSoapIn">
+    <wsdl:part name="parameters" element="tns:getThemes" />
+  </wsdl:message>
+  <wsdl:message name="getThemesSoapOut">
+    <wsdl:part name="parameters" element="tns:getThemesResponse" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesSoapIn">
+    <wsdl:part name="parameters" element="tns:getSubthemes" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesSoapOut">
+    <wsdl:part name="parameters" element="tns:getSubthemesResponse" />
+  </wsdl:message>
+  <wsdl:message name="getYearsSoapIn">
+    <wsdl:part name="parameters" element="tns:getYears" />
+  </wsdl:message>
+  <wsdl:message name="getYearsSoapOut">
+    <wsdl:part name="parameters" element="tns:getYearsResponse" />
+  </wsdl:message>
+  <wsdl:message name="getThemesForUserSoapIn">
+    <wsdl:part name="parameters" element="tns:getThemesForUser" />
+  </wsdl:message>
+  <wsdl:message name="getThemesForUserSoapOut">
+    <wsdl:part name="parameters" element="tns:getThemesForUserResponse" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesForUserSoapIn">
+    <wsdl:part name="parameters" element="tns:getSubthemesForUser" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesForUserSoapOut">
+    <wsdl:part name="parameters" element="tns:getSubthemesForUserResponse" />
+  </wsdl:message>
+  <wsdl:message name="getYearsForUserSoapIn">
+    <wsdl:part name="parameters" element="tns:getYearsForUser" />
+  </wsdl:message>
+  <wsdl:message name="getYearsForUserSoapOut">
+    <wsdl:part name="parameters" element="tns:getYearsForUserResponse" />
+  </wsdl:message>
+  <wsdl:message name="getUserNotesSoapIn">
+    <wsdl:part name="parameters" element="tns:getUserNotes" />
+  </wsdl:message>
+  <wsdl:message name="getUserNotesSoapOut">
+    <wsdl:part name="parameters" element="tns:getUserNotesResponse" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionTotalsSoapIn">
+    <wsdl:part name="parameters" element="tns:getCollectionTotals" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionTotalsSoapOut">
+    <wsdl:part name="parameters" element="tns:getCollectionTotalsResponse" />
+  </wsdl:message>
+  <wsdl:message name="setCollectionSoapIn">
+    <wsdl:part name="parameters" element="tns:setCollection" />
+  </wsdl:message>
+  <wsdl:message name="setCollectionSoapOut">
+    <wsdl:part name="parameters" element="tns:setCollectionResponse" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_ownsSoapIn">
+    <wsdl:part name="parameters" element="tns:setCollection_owns" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_ownsSoapOut">
+    <wsdl:part name="parameters" element="tns:setCollection_ownsResponse" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_wantsSoapIn">
+    <wsdl:part name="parameters" element="tns:setCollection_wants" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_wantsSoapOut">
+    <wsdl:part name="parameters" element="tns:setCollection_wantsResponse" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_userNotesSoapIn">
+    <wsdl:part name="parameters" element="tns:setCollection_userNotes" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_userNotesSoapOut">
+    <wsdl:part name="parameters" element="tns:setCollection_userNotesResponse" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_qtyOwnedSoapIn">
+    <wsdl:part name="parameters" element="tns:setCollection_qtyOwned" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_qtyOwnedSoapOut">
+    <wsdl:part name="parameters" element="tns:setCollection_qtyOwnedResponse" />
+  </wsdl:message>
+  <wsdl:message name="setMinifigCollectionSoapIn">
+    <wsdl:part name="parameters" element="tns:setMinifigCollection" />
+  </wsdl:message>
+  <wsdl:message name="setMinifigCollectionSoapOut">
+    <wsdl:part name="parameters" element="tns:setMinifigCollectionResponse" />
+  </wsdl:message>
+  <wsdl:message name="loginSoapIn">
+    <wsdl:part name="parameters" element="tns:login" />
+  </wsdl:message>
+  <wsdl:message name="loginSoapOut">
+    <wsdl:part name="parameters" element="tns:loginResponse" />
+  </wsdl:message>
+  <wsdl:message name="setCollectionDetailSoapIn">
+    <wsdl:part name="parameters" element="tns:setCollectionDetail" />
+  </wsdl:message>
+  <wsdl:message name="setCollectionDetailSoapOut">
+    <wsdl:part name="parameters" element="tns:setCollectionDetailResponse" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailSoapIn">
+    <wsdl:part name="parameters" element="tns:getCollectionDetail" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailSoapOut">
+    <wsdl:part name="parameters" element="tns:getCollectionDetailResponse" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailConditionsSoapIn">
+    <wsdl:part name="parameters" element="tns:getCollectionDetailConditions" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailConditionsSoapOut">
+    <wsdl:part name="parameters" element="tns:getCollectionDetailConditionsResponse" />
+  </wsdl:message>
+  <wsdl:message name="checkKeySoapIn">
+    <wsdl:part name="parameters" element="tns:checkKey" />
+  </wsdl:message>
+  <wsdl:message name="checkKeySoapOut">
+    <wsdl:part name="parameters" element="tns:checkKeyResponse" />
+  </wsdl:message>
+  <wsdl:message name="checkUserHashSoapIn">
+    <wsdl:part name="parameters" element="tns:checkUserHash" />
+  </wsdl:message>
+  <wsdl:message name="checkUserHashSoapOut">
+    <wsdl:part name="parameters" element="tns:checkUserHashResponse" />
+  </wsdl:message>
+  <wsdl:message name="getSetsHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="query" type="s:string" />
+    <wsdl:part name="theme" type="s:string" />
+    <wsdl:part name="subtheme" type="s:string" />
+    <wsdl:part name="setNumber" type="s:string" />
+    <wsdl:part name="year" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+    <wsdl:part name="orderBy" type="s:string" />
+    <wsdl:part name="pageSize" type="s:string" />
+    <wsdl:part name="pageNumber" type="s:string" />
+    <wsdl:part name="userName" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getSetsHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfSets" />
+  </wsdl:message>
+  <wsdl:message name="getSetHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="SetID" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getSetHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfSets" />
+  </wsdl:message>
+  <wsdl:message name="getRecentlyUpdatedSetsHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="minutesAgo" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getRecentlyUpdatedSetsHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfSets" />
+  </wsdl:message>
+  <wsdl:message name="getAdditionalImagesHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getAdditionalImagesHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfAdditionalImages" />
+  </wsdl:message>
+  <wsdl:message name="getReviewsHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getReviewsHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfReviews" />
+  </wsdl:message>
+  <wsdl:message name="getInstructionsHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getInstructionsHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfInstructions" />
+  </wsdl:message>
+  <wsdl:message name="getMinifigCollectionHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="query" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getMinifigCollectionHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfMinifigCollection" />
+  </wsdl:message>
+  <wsdl:message name="getThemesHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getThemesHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfThemes" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="theme" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfSubthemes" />
+  </wsdl:message>
+  <wsdl:message name="getYearsHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="theme" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getYearsHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfYears" />
+  </wsdl:message>
+  <wsdl:message name="getThemesForUserHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getThemesForUserHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfThemes" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesForUserHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="theme" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesForUserHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfSubthemes" />
+  </wsdl:message>
+  <wsdl:message name="getYearsForUserHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="theme" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getYearsForUserHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfYears" />
+  </wsdl:message>
+  <wsdl:message name="getUserNotesHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getUserNotesHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfUserNotes" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionTotalsHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionTotalsHttpGetOut">
+    <wsdl:part name="Body" element="tns:collectionTotals" />
+  </wsdl:message>
+  <wsdl:message name="setCollectionHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+    <wsdl:part name="qtyOwned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollectionHttpGetOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_ownsHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_ownsHttpGetOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_wantsHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_wantsHttpGetOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_userNotesHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+    <wsdl:part name="notes" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_userNotesHttpGetOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_qtyOwnedHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+    <wsdl:part name="qtyOwned" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_qtyOwnedHttpGetOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="setMinifigCollectionHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="minifigNumber" type="s:string" />
+    <wsdl:part name="qtyOwned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setMinifigCollectionHttpGetOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="loginHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="username" type="s:string" />
+    <wsdl:part name="password" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="loginHttpGetOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="SetID" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfCollectionDetails" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailConditionsHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="which" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailConditionsHttpGetOut">
+    <wsdl:part name="Body" element="tns:ArrayOfConditions" />
+  </wsdl:message>
+  <wsdl:message name="checkKeyHttpGetIn">
+    <wsdl:part name="apiKey" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="checkKeyHttpGetOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="checkUserHashHttpGetIn">
+    <wsdl:part name="userHash" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="checkUserHashHttpGetOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="getSetsHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="query" type="s:string" />
+    <wsdl:part name="theme" type="s:string" />
+    <wsdl:part name="subtheme" type="s:string" />
+    <wsdl:part name="setNumber" type="s:string" />
+    <wsdl:part name="year" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+    <wsdl:part name="orderBy" type="s:string" />
+    <wsdl:part name="pageSize" type="s:string" />
+    <wsdl:part name="pageNumber" type="s:string" />
+    <wsdl:part name="userName" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getSetsHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfSets" />
+  </wsdl:message>
+  <wsdl:message name="getSetHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="SetID" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getSetHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfSets" />
+  </wsdl:message>
+  <wsdl:message name="getRecentlyUpdatedSetsHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="minutesAgo" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getRecentlyUpdatedSetsHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfSets" />
+  </wsdl:message>
+  <wsdl:message name="getAdditionalImagesHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getAdditionalImagesHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfAdditionalImages" />
+  </wsdl:message>
+  <wsdl:message name="getReviewsHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getReviewsHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfReviews" />
+  </wsdl:message>
+  <wsdl:message name="getInstructionsHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getInstructionsHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfInstructions" />
+  </wsdl:message>
+  <wsdl:message name="getMinifigCollectionHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="query" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getMinifigCollectionHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfMinifigCollection" />
+  </wsdl:message>
+  <wsdl:message name="getThemesHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getThemesHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfThemes" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="theme" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfSubthemes" />
+  </wsdl:message>
+  <wsdl:message name="getYearsHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="theme" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getYearsHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfYears" />
+  </wsdl:message>
+  <wsdl:message name="getThemesForUserHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getThemesForUserHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfThemes" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesForUserHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="theme" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getSubthemesForUserHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfSubthemes" />
+  </wsdl:message>
+  <wsdl:message name="getYearsForUserHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="theme" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getYearsForUserHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfYears" />
+  </wsdl:message>
+  <wsdl:message name="getUserNotesHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getUserNotesHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfUserNotes" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionTotalsHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionTotalsHttpPostOut">
+    <wsdl:part name="Body" element="tns:collectionTotals" />
+  </wsdl:message>
+  <wsdl:message name="setCollectionHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+    <wsdl:part name="qtyOwned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollectionHttpPostOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_ownsHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+    <wsdl:part name="owned" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_ownsHttpPostOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_wantsHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_wantsHttpPostOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_userNotesHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+    <wsdl:part name="notes" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_userNotesHttpPostOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_qtyOwnedHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="setID" type="s:string" />
+    <wsdl:part name="qtyOwned" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setCollection_qtyOwnedHttpPostOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="setMinifigCollectionHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="minifigNumber" type="s:string" />
+    <wsdl:part name="qtyOwned" type="s:string" />
+    <wsdl:part name="wanted" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="setMinifigCollectionHttpPostOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="loginHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="username" type="s:string" />
+    <wsdl:part name="password" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="loginHttpPostOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="userHash" type="s:string" />
+    <wsdl:part name="SetID" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfCollectionDetails" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailConditionsHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+    <wsdl:part name="which" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="getCollectionDetailConditionsHttpPostOut">
+    <wsdl:part name="Body" element="tns:ArrayOfConditions" />
+  </wsdl:message>
+  <wsdl:message name="checkKeyHttpPostIn">
+    <wsdl:part name="apiKey" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="checkKeyHttpPostOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:message name="checkUserHashHttpPostIn">
+    <wsdl:part name="userHash" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="checkUserHashHttpPostOut">
+    <wsdl:part name="Body" element="tns:string" />
+  </wsdl:message>
+  <wsdl:portType name="BricksetAPIv2Soap">
+    <wsdl:operation name="getSets">
+      <wsdl:input message="tns:getSetsSoapIn" />
+      <wsdl:output message="tns:getSetsSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getSet">
+      <wsdl:input message="tns:getSetSoapIn" />
+      <wsdl:output message="tns:getSetSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getRecentlyUpdatedSets">
+      <wsdl:input message="tns:getRecentlyUpdatedSetsSoapIn" />
+      <wsdl:output message="tns:getRecentlyUpdatedSetsSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getAdditionalImages">
+      <wsdl:input message="tns:getAdditionalImagesSoapIn" />
+      <wsdl:output message="tns:getAdditionalImagesSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getReviews">
+      <wsdl:input message="tns:getReviewsSoapIn" />
+      <wsdl:output message="tns:getReviewsSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getInstructions">
+      <wsdl:input message="tns:getInstructionsSoapIn" />
+      <wsdl:output message="tns:getInstructionsSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getMinifigCollection">
+      <wsdl:input message="tns:getMinifigCollectionSoapIn" />
+      <wsdl:output message="tns:getMinifigCollectionSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getThemes">
+      <wsdl:input message="tns:getThemesSoapIn" />
+      <wsdl:output message="tns:getThemesSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemes">
+      <wsdl:input message="tns:getSubthemesSoapIn" />
+      <wsdl:output message="tns:getSubthemesSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getYears">
+      <wsdl:input message="tns:getYearsSoapIn" />
+      <wsdl:output message="tns:getYearsSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getThemesForUser">
+      <wsdl:input message="tns:getThemesForUserSoapIn" />
+      <wsdl:output message="tns:getThemesForUserSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemesForUser">
+      <wsdl:input message="tns:getSubthemesForUserSoapIn" />
+      <wsdl:output message="tns:getSubthemesForUserSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getYearsForUser">
+      <wsdl:input message="tns:getYearsForUserSoapIn" />
+      <wsdl:output message="tns:getYearsForUserSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getUserNotes">
+      <wsdl:input message="tns:getUserNotesSoapIn" />
+      <wsdl:output message="tns:getUserNotesSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionTotals">
+      <wsdl:input message="tns:getCollectionTotalsSoapIn" />
+      <wsdl:output message="tns:getCollectionTotalsSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection">
+      <wsdl:input message="tns:setCollectionSoapIn" />
+      <wsdl:output message="tns:setCollectionSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_owns">
+      <wsdl:input message="tns:setCollection_ownsSoapIn" />
+      <wsdl:output message="tns:setCollection_ownsSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_wants">
+      <wsdl:input message="tns:setCollection_wantsSoapIn" />
+      <wsdl:output message="tns:setCollection_wantsSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_userNotes">
+      <wsdl:input message="tns:setCollection_userNotesSoapIn" />
+      <wsdl:output message="tns:setCollection_userNotesSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_qtyOwned">
+      <wsdl:input message="tns:setCollection_qtyOwnedSoapIn" />
+      <wsdl:output message="tns:setCollection_qtyOwnedSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setMinifigCollection">
+      <wsdl:input message="tns:setMinifigCollectionSoapIn" />
+      <wsdl:output message="tns:setMinifigCollectionSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="login">
+      <wsdl:input message="tns:loginSoapIn" />
+      <wsdl:output message="tns:loginSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollectionDetail">
+      <wsdl:input message="tns:setCollectionDetailSoapIn" />
+      <wsdl:output message="tns:setCollectionDetailSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetail">
+      <wsdl:input message="tns:getCollectionDetailSoapIn" />
+      <wsdl:output message="tns:getCollectionDetailSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetailConditions">
+      <wsdl:input message="tns:getCollectionDetailConditionsSoapIn" />
+      <wsdl:output message="tns:getCollectionDetailConditionsSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="checkKey">
+      <wsdl:input message="tns:checkKeySoapIn" />
+      <wsdl:output message="tns:checkKeySoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="checkUserHash">
+      <wsdl:input message="tns:checkUserHashSoapIn" />
+      <wsdl:output message="tns:checkUserHashSoapOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:portType name="BricksetAPIv2HttpGet">
+    <wsdl:operation name="getSets">
+      <wsdl:input message="tns:getSetsHttpGetIn" />
+      <wsdl:output message="tns:getSetsHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getSet">
+      <wsdl:input message="tns:getSetHttpGetIn" />
+      <wsdl:output message="tns:getSetHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getRecentlyUpdatedSets">
+      <wsdl:input message="tns:getRecentlyUpdatedSetsHttpGetIn" />
+      <wsdl:output message="tns:getRecentlyUpdatedSetsHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getAdditionalImages">
+      <wsdl:input message="tns:getAdditionalImagesHttpGetIn" />
+      <wsdl:output message="tns:getAdditionalImagesHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getReviews">
+      <wsdl:input message="tns:getReviewsHttpGetIn" />
+      <wsdl:output message="tns:getReviewsHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getInstructions">
+      <wsdl:input message="tns:getInstructionsHttpGetIn" />
+      <wsdl:output message="tns:getInstructionsHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getMinifigCollection">
+      <wsdl:input message="tns:getMinifigCollectionHttpGetIn" />
+      <wsdl:output message="tns:getMinifigCollectionHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getThemes">
+      <wsdl:input message="tns:getThemesHttpGetIn" />
+      <wsdl:output message="tns:getThemesHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemes">
+      <wsdl:input message="tns:getSubthemesHttpGetIn" />
+      <wsdl:output message="tns:getSubthemesHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getYears">
+      <wsdl:input message="tns:getYearsHttpGetIn" />
+      <wsdl:output message="tns:getYearsHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getThemesForUser">
+      <wsdl:input message="tns:getThemesForUserHttpGetIn" />
+      <wsdl:output message="tns:getThemesForUserHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemesForUser">
+      <wsdl:input message="tns:getSubthemesForUserHttpGetIn" />
+      <wsdl:output message="tns:getSubthemesForUserHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getYearsForUser">
+      <wsdl:input message="tns:getYearsForUserHttpGetIn" />
+      <wsdl:output message="tns:getYearsForUserHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getUserNotes">
+      <wsdl:input message="tns:getUserNotesHttpGetIn" />
+      <wsdl:output message="tns:getUserNotesHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionTotals">
+      <wsdl:input message="tns:getCollectionTotalsHttpGetIn" />
+      <wsdl:output message="tns:getCollectionTotalsHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection">
+      <wsdl:input message="tns:setCollectionHttpGetIn" />
+      <wsdl:output message="tns:setCollectionHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_owns">
+      <wsdl:input message="tns:setCollection_ownsHttpGetIn" />
+      <wsdl:output message="tns:setCollection_ownsHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_wants">
+      <wsdl:input message="tns:setCollection_wantsHttpGetIn" />
+      <wsdl:output message="tns:setCollection_wantsHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_userNotes">
+      <wsdl:input message="tns:setCollection_userNotesHttpGetIn" />
+      <wsdl:output message="tns:setCollection_userNotesHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_qtyOwned">
+      <wsdl:input message="tns:setCollection_qtyOwnedHttpGetIn" />
+      <wsdl:output message="tns:setCollection_qtyOwnedHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setMinifigCollection">
+      <wsdl:input message="tns:setMinifigCollectionHttpGetIn" />
+      <wsdl:output message="tns:setMinifigCollectionHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="login">
+      <wsdl:input message="tns:loginHttpGetIn" />
+      <wsdl:output message="tns:loginHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetail">
+      <wsdl:input message="tns:getCollectionDetailHttpGetIn" />
+      <wsdl:output message="tns:getCollectionDetailHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetailConditions">
+      <wsdl:input message="tns:getCollectionDetailConditionsHttpGetIn" />
+      <wsdl:output message="tns:getCollectionDetailConditionsHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="checkKey">
+      <wsdl:input message="tns:checkKeyHttpGetIn" />
+      <wsdl:output message="tns:checkKeyHttpGetOut" />
+    </wsdl:operation>
+    <wsdl:operation name="checkUserHash">
+      <wsdl:input message="tns:checkUserHashHttpGetIn" />
+      <wsdl:output message="tns:checkUserHashHttpGetOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:portType name="BricksetAPIv2HttpPost">
+    <wsdl:operation name="getSets">
+      <wsdl:input message="tns:getSetsHttpPostIn" />
+      <wsdl:output message="tns:getSetsHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getSet">
+      <wsdl:input message="tns:getSetHttpPostIn" />
+      <wsdl:output message="tns:getSetHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getRecentlyUpdatedSets">
+      <wsdl:input message="tns:getRecentlyUpdatedSetsHttpPostIn" />
+      <wsdl:output message="tns:getRecentlyUpdatedSetsHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getAdditionalImages">
+      <wsdl:input message="tns:getAdditionalImagesHttpPostIn" />
+      <wsdl:output message="tns:getAdditionalImagesHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getReviews">
+      <wsdl:input message="tns:getReviewsHttpPostIn" />
+      <wsdl:output message="tns:getReviewsHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getInstructions">
+      <wsdl:input message="tns:getInstructionsHttpPostIn" />
+      <wsdl:output message="tns:getInstructionsHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getMinifigCollection">
+      <wsdl:input message="tns:getMinifigCollectionHttpPostIn" />
+      <wsdl:output message="tns:getMinifigCollectionHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getThemes">
+      <wsdl:input message="tns:getThemesHttpPostIn" />
+      <wsdl:output message="tns:getThemesHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemes">
+      <wsdl:input message="tns:getSubthemesHttpPostIn" />
+      <wsdl:output message="tns:getSubthemesHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getYears">
+      <wsdl:input message="tns:getYearsHttpPostIn" />
+      <wsdl:output message="tns:getYearsHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getThemesForUser">
+      <wsdl:input message="tns:getThemesForUserHttpPostIn" />
+      <wsdl:output message="tns:getThemesForUserHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemesForUser">
+      <wsdl:input message="tns:getSubthemesForUserHttpPostIn" />
+      <wsdl:output message="tns:getSubthemesForUserHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getYearsForUser">
+      <wsdl:input message="tns:getYearsForUserHttpPostIn" />
+      <wsdl:output message="tns:getYearsForUserHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getUserNotes">
+      <wsdl:input message="tns:getUserNotesHttpPostIn" />
+      <wsdl:output message="tns:getUserNotesHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionTotals">
+      <wsdl:input message="tns:getCollectionTotalsHttpPostIn" />
+      <wsdl:output message="tns:getCollectionTotalsHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection">
+      <wsdl:input message="tns:setCollectionHttpPostIn" />
+      <wsdl:output message="tns:setCollectionHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_owns">
+      <wsdl:input message="tns:setCollection_ownsHttpPostIn" />
+      <wsdl:output message="tns:setCollection_ownsHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_wants">
+      <wsdl:input message="tns:setCollection_wantsHttpPostIn" />
+      <wsdl:output message="tns:setCollection_wantsHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_userNotes">
+      <wsdl:input message="tns:setCollection_userNotesHttpPostIn" />
+      <wsdl:output message="tns:setCollection_userNotesHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_qtyOwned">
+      <wsdl:input message="tns:setCollection_qtyOwnedHttpPostIn" />
+      <wsdl:output message="tns:setCollection_qtyOwnedHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="setMinifigCollection">
+      <wsdl:input message="tns:setMinifigCollectionHttpPostIn" />
+      <wsdl:output message="tns:setMinifigCollectionHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="login">
+      <wsdl:input message="tns:loginHttpPostIn" />
+      <wsdl:output message="tns:loginHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetail">
+      <wsdl:input message="tns:getCollectionDetailHttpPostIn" />
+      <wsdl:output message="tns:getCollectionDetailHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetailConditions">
+      <wsdl:input message="tns:getCollectionDetailConditionsHttpPostIn" />
+      <wsdl:output message="tns:getCollectionDetailConditionsHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="checkKey">
+      <wsdl:input message="tns:checkKeyHttpPostIn" />
+      <wsdl:output message="tns:checkKeyHttpPostOut" />
+    </wsdl:operation>
+    <wsdl:operation name="checkUserHash">
+      <wsdl:input message="tns:checkUserHashHttpPostIn" />
+      <wsdl:output message="tns:checkUserHashHttpPostOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="BricksetAPIv2Soap" type="tns:BricksetAPIv2Soap">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="getSets">
+      <soap:operation soapAction="https://brickset.com/api/getSets" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSet">
+      <soap:operation soapAction="https://brickset.com/api/getSet" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getRecentlyUpdatedSets">
+      <soap:operation soapAction="https://brickset.com/api/getRecentlyUpdatedSets" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getAdditionalImages">
+      <soap:operation soapAction="https://brickset.com/api/getAdditionalImages" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getReviews">
+      <soap:operation soapAction="https://brickset.com/api/getReviews" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getInstructions">
+      <soap:operation soapAction="https://brickset.com/api/getInstructions" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getMinifigCollection">
+      <soap:operation soapAction="https://brickset.com/api/getMinifigCollection" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getThemes">
+      <soap:operation soapAction="https://brickset.com/api/getThemes" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemes">
+      <soap:operation soapAction="https://brickset.com/api/getSubthemes" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getYears">
+      <soap:operation soapAction="https://brickset.com/api/getYears" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getThemesForUser">
+      <soap:operation soapAction="https://brickset.com/api/getThemesForUser" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemesForUser">
+      <soap:operation soapAction="https://brickset.com/api/getSubthemesForUser" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getYearsForUser">
+      <soap:operation soapAction="https://brickset.com/api/getYearsForUser" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getUserNotes">
+      <soap:operation soapAction="https://brickset.com/api/getUserNotes" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionTotals">
+      <soap:operation soapAction="https://brickset.com/api/getCollectionTotals" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection">
+      <soap:operation soapAction="https://brickset.com/api/setCollection" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_owns">
+      <soap:operation soapAction="https://brickset.com/api/setCollection_owns" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_wants">
+      <soap:operation soapAction="https://brickset.com/api/setCollection_wants" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_userNotes">
+      <soap:operation soapAction="https://brickset.com/api/setCollection_userNotes" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_qtyOwned">
+      <soap:operation soapAction="https://brickset.com/api/setCollection_qtyOwned" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setMinifigCollection">
+      <soap:operation soapAction="https://brickset.com/api/setMinifigCollection" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="login">
+      <soap:operation soapAction="https://brickset.com/api/login" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollectionDetail">
+      <soap:operation soapAction="https://brickset.com/api/setCollectionDetail" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetail">
+      <soap:operation soapAction="https://brickset.com/api/getCollectionDetail" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetailConditions">
+      <soap:operation soapAction="https://brickset.com/api/getCollectionDetailConditions" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="checkKey">
+      <soap:operation soapAction="https://brickset.com/api/checkKey" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="checkUserHash">
+      <soap:operation soapAction="https://brickset.com/api/checkUserHash" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="BricksetAPIv2Soap12" type="tns:BricksetAPIv2Soap">
+    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="getSets">
+      <soap12:operation soapAction="https://brickset.com/api/getSets" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSet">
+      <soap12:operation soapAction="https://brickset.com/api/getSet" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getRecentlyUpdatedSets">
+      <soap12:operation soapAction="https://brickset.com/api/getRecentlyUpdatedSets" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getAdditionalImages">
+      <soap12:operation soapAction="https://brickset.com/api/getAdditionalImages" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getReviews">
+      <soap12:operation soapAction="https://brickset.com/api/getReviews" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getInstructions">
+      <soap12:operation soapAction="https://brickset.com/api/getInstructions" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getMinifigCollection">
+      <soap12:operation soapAction="https://brickset.com/api/getMinifigCollection" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getThemes">
+      <soap12:operation soapAction="https://brickset.com/api/getThemes" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemes">
+      <soap12:operation soapAction="https://brickset.com/api/getSubthemes" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getYears">
+      <soap12:operation soapAction="https://brickset.com/api/getYears" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getThemesForUser">
+      <soap12:operation soapAction="https://brickset.com/api/getThemesForUser" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemesForUser">
+      <soap12:operation soapAction="https://brickset.com/api/getSubthemesForUser" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getYearsForUser">
+      <soap12:operation soapAction="https://brickset.com/api/getYearsForUser" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getUserNotes">
+      <soap12:operation soapAction="https://brickset.com/api/getUserNotes" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionTotals">
+      <soap12:operation soapAction="https://brickset.com/api/getCollectionTotals" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection">
+      <soap12:operation soapAction="https://brickset.com/api/setCollection" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_owns">
+      <soap12:operation soapAction="https://brickset.com/api/setCollection_owns" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_wants">
+      <soap12:operation soapAction="https://brickset.com/api/setCollection_wants" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_userNotes">
+      <soap12:operation soapAction="https://brickset.com/api/setCollection_userNotes" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_qtyOwned">
+      <soap12:operation soapAction="https://brickset.com/api/setCollection_qtyOwned" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setMinifigCollection">
+      <soap12:operation soapAction="https://brickset.com/api/setMinifigCollection" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="login">
+      <soap12:operation soapAction="https://brickset.com/api/login" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollectionDetail">
+      <soap12:operation soapAction="https://brickset.com/api/setCollectionDetail" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetail">
+      <soap12:operation soapAction="https://brickset.com/api/getCollectionDetail" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetailConditions">
+      <soap12:operation soapAction="https://brickset.com/api/getCollectionDetailConditions" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="checkKey">
+      <soap12:operation soapAction="https://brickset.com/api/checkKey" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="checkUserHash">
+      <soap12:operation soapAction="https://brickset.com/api/checkUserHash" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="BricksetAPIv2HttpGet" type="tns:BricksetAPIv2HttpGet">
+    <http:binding verb="GET" />
+    <wsdl:operation name="getSets">
+      <http:operation location="/getSets" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSet">
+      <http:operation location="/getSet" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getRecentlyUpdatedSets">
+      <http:operation location="/getRecentlyUpdatedSets" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getAdditionalImages">
+      <http:operation location="/getAdditionalImages" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getReviews">
+      <http:operation location="/getReviews" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getInstructions">
+      <http:operation location="/getInstructions" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getMinifigCollection">
+      <http:operation location="/getMinifigCollection" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getThemes">
+      <http:operation location="/getThemes" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemes">
+      <http:operation location="/getSubthemes" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getYears">
+      <http:operation location="/getYears" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getThemesForUser">
+      <http:operation location="/getThemesForUser" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemesForUser">
+      <http:operation location="/getSubthemesForUser" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getYearsForUser">
+      <http:operation location="/getYearsForUser" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getUserNotes">
+      <http:operation location="/getUserNotes" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionTotals">
+      <http:operation location="/getCollectionTotals" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection">
+      <http:operation location="/setCollection" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_owns">
+      <http:operation location="/setCollection_owns" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_wants">
+      <http:operation location="/setCollection_wants" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_userNotes">
+      <http:operation location="/setCollection_userNotes" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_qtyOwned">
+      <http:operation location="/setCollection_qtyOwned" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setMinifigCollection">
+      <http:operation location="/setMinifigCollection" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="login">
+      <http:operation location="/login" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetail">
+      <http:operation location="/getCollectionDetail" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetailConditions">
+      <http:operation location="/getCollectionDetailConditions" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="checkKey">
+      <http:operation location="/checkKey" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="checkUserHash">
+      <http:operation location="/checkUserHash" />
+      <wsdl:input>
+        <http:urlEncoded />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="BricksetAPIv2HttpPost" type="tns:BricksetAPIv2HttpPost">
+    <http:binding verb="POST" />
+    <wsdl:operation name="getSets">
+      <http:operation location="/getSets" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSet">
+      <http:operation location="/getSet" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getRecentlyUpdatedSets">
+      <http:operation location="/getRecentlyUpdatedSets" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getAdditionalImages">
+      <http:operation location="/getAdditionalImages" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getReviews">
+      <http:operation location="/getReviews" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getInstructions">
+      <http:operation location="/getInstructions" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getMinifigCollection">
+      <http:operation location="/getMinifigCollection" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getThemes">
+      <http:operation location="/getThemes" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemes">
+      <http:operation location="/getSubthemes" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getYears">
+      <http:operation location="/getYears" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getThemesForUser">
+      <http:operation location="/getThemesForUser" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getSubthemesForUser">
+      <http:operation location="/getSubthemesForUser" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getYearsForUser">
+      <http:operation location="/getYearsForUser" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getUserNotes">
+      <http:operation location="/getUserNotes" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionTotals">
+      <http:operation location="/getCollectionTotals" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection">
+      <http:operation location="/setCollection" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_owns">
+      <http:operation location="/setCollection_owns" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_wants">
+      <http:operation location="/setCollection_wants" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_userNotes">
+      <http:operation location="/setCollection_userNotes" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setCollection_qtyOwned">
+      <http:operation location="/setCollection_qtyOwned" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setMinifigCollection">
+      <http:operation location="/setMinifigCollection" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="login">
+      <http:operation location="/login" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetail">
+      <http:operation location="/getCollectionDetail" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getCollectionDetailConditions">
+      <http:operation location="/getCollectionDetailConditions" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="checkKey">
+      <http:operation location="/checkKey" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="checkUserHash">
+      <http:operation location="/checkUserHash" />
+      <wsdl:input>
+        <mime:content type="application/x-www-form-urlencoded" />
+      </wsdl:input>
+      <wsdl:output>
+        <mime:mimeXml part="Body" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="BricksetAPIv2">
+    <wsdl:port name="BricksetAPIv2Soap" binding="tns:BricksetAPIv2Soap">
+      <soap:address location="http://brickset.com/api/v2.asmx" />
+    </wsdl:port>
+    <wsdl:port name="BricksetAPIv2Soap12" binding="tns:BricksetAPIv2Soap12">
+      <soap12:address location="http://brickset.com/api/v2.asmx" />
+    </wsdl:port>
+    <wsdl:port name="BricksetAPIv2HttpGet" binding="tns:BricksetAPIv2HttpGet">
+      <http:address location="http://brickset.com/api/v2.asmx" />
+    </wsdl:port>
+    <wsdl:port name="BricksetAPIv2HttpPost" binding="tns:BricksetAPIv2HttpPost">
+      <http:address location="http://brickset.com/api/v2.asmx" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/app/config/config.yml b/app/config/config.yml
index 91c89d3..9bf88c9 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -7,10 +7,8 @@ imports:
 # http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
     locale: en
-    # rebrickable csv files root URL
-    rebrickable_url: 'http://rebrickable.com/media/downloads/'
-    # LDraw library zip file URL
-    ldraw_url: 'http://www.ldraw.org/library/updates/complete.zip'
+    # rebrickable csv files root URL (http://rebrickable.com/media/downloads/ or local dir containing csv files)
+    rebrickable_csv_url: 'http://rebrickable.com/media/downloads/'
 
 framework:
     #esi:             ~
@@ -92,11 +90,56 @@ knp_paginator:
         pagination: KnpPaginatorBundle:Pagination:semantic_ui_pagination.html.twig     # sliding pagination controls template
         sortable: KnpPaginatorBundle:Pagination:sortable_link.html.twig # sort link template
 
+liip_imagine:
+    loaders:
+        media:
+          flysystem:
+              filesystem_service: oneup_flysystem.media_filesystem
+        rebrickable:
+              stream:
+                  wrapper: 'http://m.rebrickable.com/media/'
+
+    resolvers:
+        default:
+            web_path: ~
+
+    filter_sets:
+        model_min:
+            data_loader: media
+            cache: ~
+            quality: 80
+            default_image: '/resources/images/unknown_image.png'
+            filters:
+                thumbnail: { size: [200, 200], mode: inset }
+                background: { size: [250, 250], position: center, color: '#FFFFFF' }
+        model_large:
+              data_loader: media
+              cache: ~
+              quality: 92
+              filters:
+                  thumbnail: { size: [800, 600], mode: inset }
+                  background: { size: [1100, 800], position: center, color: '#FFFFFF' }
+        rebrickable:
+                      data_loader: rebrickable
+        rebrickable_part_min:
+              quality: 80
+              data_loader: rebrickable
+              cache: ~
+              default_image: '/resources/images/unknown_image.png'
+              filters:
+                  thumbnail: { size: [250, 250], mode: inset }
+        rebrickable_set_min:
+              quality: 80
+              data_loader: rebrickable
+              default_image: '/resources/images/unknown_image.png'
+              cache: ~
+              filters:
+                  thumbnail: { size: [250, 250], mode: inset }
 oneup_flysystem:
     adapters:
-        media_adapter:
+        media:
             local:
                 directory: "%kernel.root_dir%/../var/media/"
     filesystems:
         media:
-            adapter: media_adapter
\ No newline at end of file
+            adapter: media
\ No newline at end of file
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 7eb4739..f4d3c25 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -12,15 +12,22 @@ web_profiler:
     intercept_redirects: false
 
 monolog:
+    channels: ['loader']
     handlers:
         main:
             type: stream
             path: "%kernel.logs_dir%/%kernel.environment%.log"
             level: debug
-            channels: [!event]
+            channels: [!event, !loader]
         console:
             type:   console
             channels: [!event, !doctrine]
+        loader:
+            type: rotating_file
+            path: "%kernel.logs_dir%/loader.log"
+            level: debug
+            channels: 'loader'
+            max_files: 10
         # uncomment to get logging in your browser
         # you may have to allow bigger header sizes in your Web server configuration
         #firephp:
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 8eadc31..28ac584 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,3 +1,5 @@
 app:
     resource: "@AppBundle/Controller/"
     type:     annotation
+_liip_imagine:
+    resource: "@LiipImagineBundle/Resources/config/routing.xml"
\ No newline at end of file
diff --git a/app/config/service/api.yml b/app/config/service/api.yml
index 23290ef..a12b773 100644
--- a/app/config/service/api.yml
+++ b/app/config/service/api.yml
@@ -1,7 +1,7 @@
 services:
     api.client.brickset:
         class: AppBundle\Api\Client\Brickset\Brickset
-        arguments: ['%brickset_apikey%']
+        arguments: ['%brickset_apikey%', '%kernel.root_dir%/config/brickset.xml']
     api.client.rebrickable:
         class: AppBundle\Api\Client\Rebrickable\Rebrickable_v3
         arguments: ['%rebrickable_apikey%']
diff --git a/app/config/service/form.yml b/app/config/service/form.yml
index 8dcc806..bcb354d 100644
--- a/app/config/service/form.yml
+++ b/app/config/service/form.yml
@@ -1,7 +1,20 @@
 services:
     form.filter.category:
-        class: AppBundle\Form\Filter\CategoryFilterType
+        class: AppBundle\Form\Filter\Model\CategoryFilterType
         arguments:
-            - '@manager.ldraw.category'
+            - '@repository.ldraw.category'
         tags:
-            - { name: form.type }
\ No newline at end of file
+            - { name: form.type }
+
+    form.filter.brickset:
+        class: AppBundle\Form\FilterSetType
+        arguments: ['@api.manager.brickset']
+        tags:
+            - { name: form.type }
+
+    form.filter.theme:
+        class: AppBundle\Form\Filter\Set\ThemeFilterType
+        arguments:
+            - '@repository.rebrickable.theme'
+        tags:
+            - { name: form.type }
diff --git a/app/config/service/loader.yml b/app/config/service/loader.yml
index 61fde37..0dbf6f6 100644
--- a/app/config/service/loader.yml
+++ b/app/config/service/loader.yml
@@ -1,29 +1,25 @@
 services:
-    service.loader:
+    service.loader.base:
         abstract:  true
-        class: AppBundle\Service\Loader\BaseLoaderService
+        class: AppBundle\Service\Loader\BaseLoader
         calls:
-          - [setArguments, ['@doctrine.orm.entity_manager', '@app.relation.mapper']]
+          - [setArguments, ['@doctrine.orm.entity_manager', '@monolog.logger.loader']]
 
     service.ldview:
         class: AppBundle\Service\LDViewService
         arguments: ['%ldview_bin%', '@oneup_flysystem.media_filesystem']
 
     service.loader.rebrickable:
-        class: AppBundle\Service\Loader\RebrickableLoaderService
-        arguments: ['%rebrickable_url%']
-        parent: service.loader
+        class: AppBundle\Service\Loader\RebrickableLoader
+        arguments: ['%rebrickable_csv_url%']
+        parent: service.loader.base
 
-    util.dat.parser:
-        class: AppBundle\Utils\DatParser
-        arguments: ['@app.relation.mapper']
-
-    service.loader.ldraw:
-        class: AppBundle\Service\Loader\LDrawLoaderService
-        arguments: ['@service.ldview', '%ldraw_url%', '@manager.ldraw', '@util.dat.parser']
-        parent: service.loader
+    service.loader.model:
+        class: AppBundle\Service\Loader\ModelLoader
+        arguments: ['@service.ldview', '@app.relation.mapper']
+        parent: service.loader.base
 
     service.loader.relation:
         class: AppBundle\Service\Loader\RelationLoader
-        arguments: ['@manager.ldraw.model', '@repository.rebrickable.part', '@api.manager.rebrickable']
-        parent: service.loader
\ No newline at end of file
+        arguments: ['@api.manager.rebrickable', '@app.relation.mapper']
+        parent: service.loader.base
\ No newline at end of file
diff --git a/app/config/service/manager.yml b/app/config/service/manager.yml
index 1490a07..9e4a3f5 100644
--- a/app/config/service/manager.yml
+++ b/app/config/service/manager.yml
@@ -1,28 +1 @@
-services:
-    manager.ldraw.keyword:
-        class: AppBundle\Manager\LDraw\KeywordManager
-        arguments:
-            - "@repository.ldraw.keyword"
-    manager.ldraw.category:
-        class: AppBundle\Manager\LDraw\CategoryManager
-        arguments:
-            - "@repository.ldraw.category"
-    manager.ldraw.type:
-        class: AppBundle\Manager\LDraw\TypeManager
-        arguments:
-            - "@repository.ldraw.type"
-    manager.ldraw.subpart:
-        class: AppBundle\Manager\LDraw\SubpartManager
-        arguments:
-            - "@repository.ldraw.subpart"
-    manager.ldraw.model:
-        class: AppBundle\Manager\LDraw\ModelManager
-        arguments:
-            - "@repository.ldraw.model"
-    manager.ldraw.alias:
-        class: AppBundle\Manager\LDraw\AliasManager
-        arguments:
-            - "@repository.ldraw.alias"
-
-
-
+services:
\ No newline at end of file
diff --git a/app/config/service/repository.yml b/app/config/service/repository.yml
index 080bbdf..afb69d5 100644
--- a/app/config/service/repository.yml
+++ b/app/config/service/repository.yml
@@ -41,6 +41,13 @@ services:
           arguments:
               - AppBundle\Entity\LDraw\Alias
 
+    repository.ldraw.author:
+            class: Doctrine\ORM\EntityRepository
+            factory: ["@doctrine", getRepository]
+            arguments:
+                - AppBundle\Entity\LDraw\Author
+
+
     repository.rebrickable.category:
           class: Doctrine\ORM\EntityRepository
           factory: ["@doctrine", getRepository]
diff --git a/app/config/service/service.yml b/app/config/service/service.yml
index f69f787..88c5c8b 100644
--- a/app/config/service/service.yml
+++ b/app/config/service/service.yml
@@ -1,19 +1,10 @@
 services:
-    manager.ldraw:
-        class: AppBundle\Manager\LDrawManager
-        arguments:
-            - '@manager.ldraw.category'
-            - '@manager.ldraw.keyword'
-            - '@manager.ldraw.type'
-            - '@manager.ldraw.subpart'
-            - '@manager.ldraw.model'
-            - '@manager.ldraw.alias'
-
-    app.form.filter_set:
-        class: AppBundle\Form\FilterSetType
-        arguments: ['@api.manager.brickset']
+    app.twig_extension:
+        class: AppBundle\Twig\AppExtension
+        public: false
+        arguments: ['@api.manager.rebrickable']
         tags:
-            - { name: form.type }
+            - { name: twig.extension }
 
     app.relation.mapper:
         class: AppBundle\Utils\RelationMapper
diff --git a/composer.json b/composer.json
index 6c2d004..2a7f64b 100644
--- a/composer.json
+++ b/composer.json
@@ -23,10 +23,11 @@
         "sensio/framework-extra-bundle": "^3.0.2",
         "incenteev/composer-parameter-handler": "^2.0",
         "guzzlehttp/guzzle": "^6.2",
-        "knplabs/knp-menu-bundle": "^2.0",
+        "knplabs/knp-menu-bundle": "^2.1",
         "oneup/flysystem-bundle": "^1.7",
         "knplabs/knp-paginator-bundle": "^2.5",
-        "lexik/form-filter-bundle": "~5.0"
+        "lexik/form-filter-bundle": "~5.0",
+        "liip/imagine-bundle": "^1.7"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",
diff --git a/composer.lock b/composer.lock
index 6f1f745..185359a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,67 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "6956e65252fd75b8d2e258fcc54fa3a9",
+    "content-hash": "6a70240b303126447c6fc3c6f75bf6ff",
     "packages": [
+        {
+            "name": "composer/ca-bundle",
+            "version": "1.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/ca-bundle.git",
+                "reference": "b17e6153cb7f33c7e44eb59578dc12eee5dc8e12"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/b17e6153cb7f33c7e44eb59578dc12eee5dc8e12",
+                "reference": "b17e6153cb7f33c7e44eb59578dc12eee5dc8e12",
+                "shasum": ""
+            },
+            "require": {
+                "ext-openssl": "*",
+                "ext-pcre": "*",
+                "php": "^5.3.2 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5",
+                "psr/log": "^1.0",
+                "symfony/process": "^2.5 || ^3.0"
+            },
+            "suggest": {
+                "symfony/process": "This is necessary to reliably check whether openssl_x509_parse is vulnerable on older php versions, but can be ignored on PHP 5.5.6+"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\CaBundle\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
+            "keywords": [
+                "cabundle",
+                "cacert",
+                "certificate",
+                "ssl",
+                "tls"
+            ],
+            "time": "2017-03-06T11:59:08+00:00"
+        },
         {
             "name": "doctrine/annotations",
             "version": "v1.2.7",
@@ -952,6 +1011,63 @@
             ],
             "time": "2017-03-20T17:10:46+00:00"
         },
+        {
+            "name": "imagine/imagine",
+            "version": "v0.6.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/avalanche123/Imagine.git",
+                "reference": "149041d2a1b517107bfe270ca2b1a17aa341715d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/149041d2a1b517107bfe270ca2b1a17aa341715d",
+                "reference": "149041d2a1b517107bfe270ca2b1a17aa341715d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "sami/sami": "dev-master"
+            },
+            "suggest": {
+                "ext-gd": "to use the GD implementation",
+                "ext-gmagick": "to use the Gmagick implementation",
+                "ext-imagick": "to use the Imagick implementation"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "0.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Imagine": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bulat Shakirzyanov",
+                    "email": "mallluhuct@gmail.com",
+                    "homepage": "http://avalanche123.com"
+                }
+            ],
+            "description": "Image processing for PHP 5.3",
+            "homepage": "http://imagine.readthedocs.org/",
+            "keywords": [
+                "drawing",
+                "graphics",
+                "image manipulation",
+                "image processing"
+            ],
+            "time": "2015-09-19T16:54:05+00:00"
+        },
         {
             "name": "incenteev/composer-parameter-handler",
             "version": "v2.1.2",
@@ -1053,6 +1169,94 @@
             ],
             "time": "2014-01-12T16:20:24+00:00"
         },
+        {
+            "name": "knplabs/gaufrette",
+            "version": "v0.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/KnpLabs/Gaufrette.git",
+                "reference": "771ad16f4b2e7f9d35f44b201956e83c6fbf5dde"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/KnpLabs/Gaufrette/zipball/771ad16f4b2e7f9d35f44b201956e83c6fbf5dde",
+                "reference": "771ad16f4b2e7f9d35f44b201956e83c6fbf5dde",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4"
+            },
+            "conflict": {
+                "microsoft/windowsazure": "<0.4.3"
+            },
+            "require-dev": {
+                "amazonwebservices/aws-sdk-for-php": "1.5.*",
+                "aws/aws-sdk-php": "^2.4.12",
+                "doctrine/dbal": ">=2.3",
+                "dropbox-php/dropbox-php": "*",
+                "google/apiclient": "~1.1.3",
+                "herzult/php-ssh": "*",
+                "league/flysystem": "~1.0",
+                "mikey179/vfsstream": "~1.2.0",
+                "phpseclib/phpseclib": "^2.0",
+                "phpspec/phpspec": "~2.4",
+                "phpunit/phpunit": "3.7.*",
+                "rackspace/php-opencloud": "^1.9.2"
+            },
+            "suggest": {
+                "amazonwebservices/aws-sdk-for-php": "to use the legacy Amazon S3 adapters",
+                "aws/aws-sdk-php": "to use the Amazon S3 adapter",
+                "doctrine/dbal": "to use the Doctrine DBAL adapter",
+                "dropbox-php/dropbox-php": "to use the Dropbox adapter",
+                "ext-apc": "to use the APC adapter",
+                "ext-curl": "*",
+                "ext-fileinfo": "This extension is used to automatically detect the content-type of a file in the AwsS3, OpenCloud, AzureBlogStorage and GoogleCloudStorage adapters",
+                "ext-mbstring": "*",
+                "ext-mongo": "*",
+                "ext-zip": "to use the Zip adapter",
+                "google/apiclient": "to use GoogleCloudStorage adapter",
+                "herzult/php-ssh": "to use SFtp adapter",
+                "knplabs/knp-gaufrette-bundle": "to use with Symfony2",
+                "league/flysystem": "to use Flysystem adapters",
+                "microsoft/windowsazure": "to use Microsoft Azure Blob Storage adapter",
+                "phpseclib/phpseclib": "to use PhpseclibSftp adapter",
+                "rackspace/php-opencloud": "to use Opencloud adapter"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Gaufrette": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "The contributors",
+                    "homepage": "http://github.com/knplabs/Gaufrette/contributors"
+                },
+                {
+                    "name": "KnpLabs Team",
+                    "homepage": "http://knplabs.com"
+                }
+            ],
+            "description": "PHP5 library that provides a filesystem abstraction layer",
+            "homepage": "http://knplabs.com",
+            "keywords": [
+                "abstraction",
+                "file",
+                "filesystem",
+                "media"
+            ],
+            "time": "2017-03-20T01:23:34+00:00"
+        },
         {
             "name": "knplabs/knp-components",
             "version": "1.3.4",
@@ -1124,6 +1328,64 @@
             ],
             "time": "2016-12-06T18:10:24+00:00"
         },
+        {
+            "name": "knplabs/knp-gaufrette-bundle",
+            "version": "v0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/KnpLabs/KnpGaufretteBundle.git",
+                "reference": "06d91a8a575773cd0361c1246c9c499b6bdd5d68"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/KnpLabs/KnpGaufretteBundle/zipball/06d91a8a575773cd0361c1246c9c499b6bdd5d68",
+                "reference": "06d91a8a575773cd0361c1246c9c499b6bdd5d68",
+                "shasum": ""
+            },
+            "require": {
+                "knplabs/gaufrette": "~0.1.7|~0.2|~0.3",
+                "symfony/framework-bundle": "~2.0|~3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2",
+                "symfony/console": "~2.0|~3.0",
+                "symfony/yaml": "~2.0|~3.0"
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Knp\\Bundle\\GaufretteBundle\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "The contributors",
+                    "homepage": "https://github.com/knplabs/KnpGaufretteBundle/contributors"
+                },
+                {
+                    "name": "Antoine Hérault",
+                    "email": "antoine.herault@gmail.com"
+                }
+            ],
+            "description": "Allows to easily use the Gaufrette library in a Symfony project",
+            "homepage": "http://knplabs.com",
+            "keywords": [
+                "abstraction",
+                "file",
+                "filesystem",
+                "media"
+            ],
+            "time": "2017-03-16T21:01:25+00:00"
+        },
         {
             "name": "knplabs/knp-menu",
             "version": "2.2.0",
@@ -1394,16 +1656,16 @@
         },
         {
             "name": "lexik/form-filter-bundle",
-            "version": "v5.0.3",
+            "version": "v5.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lexik/LexikFormFilterBundle.git",
-                "reference": "124a6c8e9eb109e7616a18d916bbc33137bb308d"
+                "reference": "28c09d6d9f278875ca9648c4b66eeb457c37d3b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lexik/LexikFormFilterBundle/zipball/124a6c8e9eb109e7616a18d916bbc33137bb308d",
-                "reference": "124a6c8e9eb109e7616a18d916bbc33137bb308d",
+                "url": "https://api.github.com/repos/lexik/LexikFormFilterBundle/zipball/28c09d6d9f278875ca9648c4b66eeb457c37d3b6",
+                "reference": "28c09d6d9f278875ca9648c4b66eeb457c37d3b6",
                 "shasum": ""
             },
             "require": {
@@ -1444,13 +1706,113 @@
             "description": "This bundle aim to provide classes to build some form filters and then build a doctrine query from this form filter.",
             "homepage": "https://github.com/lexik/LexikFormFilterBundle",
             "keywords": [
-                "Symfony2",
                 "bundle",
                 "doctrine",
                 "filter",
-                "form"
+                "form",
+                "symfony"
             ],
-            "time": "2017-01-24T13:03:45+00:00"
+            "time": "2017-03-27T07:28:34+00:00"
+        },
+        {
+            "name": "liip/imagine-bundle",
+            "version": "1.7.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/liip/LiipImagineBundle.git",
+                "reference": "105dd9c3446e3eb44e33161d4e636a3abafb6d7f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/liip/LiipImagineBundle/zipball/105dd9c3446e3eb44e33161d4e636a3abafb6d7f",
+                "reference": "105dd9c3446e3eb44e33161d4e636a3abafb6d7f",
+                "shasum": ""
+            },
+            "require": {
+                "imagine/imagine": "^0.6.3,<0.7",
+                "php": "^5.3.9|^7.0",
+                "symfony/asset": "~2.3|~3.0",
+                "symfony/filesystem": "~2.3|~3.0",
+                "symfony/finder": "~2.3|~3.0",
+                "symfony/framework-bundle": "~2.3|~3.0",
+                "symfony/options-resolver": "~2.3|~3.0",
+                "symfony/process": "~2.3|~3.0",
+                "symfony/templating": "~2.3|~3.0",
+                "symfony/translation": "~2.3|~3.0"
+            },
+            "require-dev": {
+                "amazonwebservices/aws-sdk-for-php": "~1.0",
+                "aws/aws-sdk-php": "~2.4",
+                "doctrine/cache": "~1.1",
+                "doctrine/orm": "~2.3",
+                "ext-gd": "*",
+                "friendsofphp/php-cs-fixer": "~2.0",
+                "phpunit/phpunit": "~4.3|~5.0",
+                "psr/log": "~1.0",
+                "satooshi/php-coveralls": "~1.0",
+                "sllh/php-cs-fixer-styleci-bridge": "~2.1",
+                "symfony/browser-kit": "~2.3|~3.0",
+                "symfony/console": "~2.3|~3.0",
+                "symfony/dependency-injection": "~2.3|~3.0",
+                "symfony/form": "~2.3|~3.0",
+                "symfony/phpunit-bridge": "~2.3|~3.0",
+                "symfony/validator": "~2.3|~3.0",
+                "symfony/yaml": "~2.3|~3.0",
+                "twig/twig": "~1.12|~2.0"
+            },
+            "suggest": {
+                "alcaeus/mongo-php-adapter": "required on PHP >= 7.0 to use mongo components with mongodb extension",
+                "amazonwebservices/aws-sdk-for-php": "required to use AWS version 1 cache resolver",
+                "aws/aws-sdk-php": "required to use AWS version 2/3 cache resolver",
+                "doctrine/mongodb-odm": "required to use mongodb-backed doctrine components",
+                "ext-exif": "required to read EXIF metadata from images",
+                "ext-gd": "required to use gd driver",
+                "ext-gmagick": "required to use gmagick driver",
+                "ext-imagick": "required to use imagick driver",
+                "ext-mongo": "required for mongodb components on PHP <7.0",
+                "ext-mongodb": "required for mongodb components on PHP >=7.0",
+                "league/flysystem": "required to use FlySystem data loader or cache resolver",
+                "monolog/monolog": "A psr/log compatible logger is required to enable logging",
+                "twig/twig": "required to use the provided Twig extension. Version 1.12 or greater needed"
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.0": "1.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Liip\\ImagineBundle\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Liip and other contributors",
+                    "homepage": "https://github.com/liip/LiipImagineBundle/contributors"
+                }
+            ],
+            "description": "This bundle provides an image manipulation abstraction toolkit for Symfony-based projects.",
+            "homepage": "http://liip.ch",
+            "keywords": [
+                "bundle",
+                "image",
+                "imagine",
+                "liip",
+                "manipulation",
+                "photos",
+                "pictures",
+                "symfony",
+                "transformation"
+            ],
+            "time": "2017-03-02T20:18:55+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -1532,16 +1894,16 @@
         },
         {
             "name": "oneup/flysystem-bundle",
-            "version": "1.11.0",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/1up-lab/OneupFlysystemBundle.git",
-                "reference": "a68f83415e3af2313c529be6b22bfddfcfe8e90f"
+                "reference": "2addd1077360790a7722fef09388a003576d585c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/1up-lab/OneupFlysystemBundle/zipball/a68f83415e3af2313c529be6b22bfddfcfe8e90f",
-                "reference": "a68f83415e3af2313c529be6b22bfddfcfe8e90f",
+                "url": "https://api.github.com/repos/1up-lab/OneupFlysystemBundle/zipball/2addd1077360790a7722fef09388a003576d585c",
+                "reference": "2addd1077360790a7722fef09388a003576d585c",
                 "shasum": ""
             },
             "require": {
@@ -1562,6 +1924,7 @@
                 "league/flysystem-ziparchive": "~1.0",
                 "litipk/flysystem-fallback-adapter": "~0.1",
                 "phpunit/phpunit": "^4.4",
+                "superbalist/flysystem-google-storage": "~4.0",
                 "symfony/asset": "~2.0|~3.0",
                 "symfony/browser-kit": "~2.0|~3.0",
                 "symfony/finder": "~2.0|~3.0",
@@ -1583,6 +1946,7 @@
                 "league/flysystem-webdav": "Allows you to use WebDAV storage",
                 "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
                 "litipk/flysystem-fallback-adapter": "Allows you to use a fallback filesystem",
+                "superbalist/flysystem-google-storage": "Allows you to use Google Cloud Storage buckets",
                 "twistor/flysystem-stream-wrapper": "Allows you to use stream wrapper"
             },
             "type": "symfony-bundle",
@@ -1611,7 +1975,7 @@
                 "abstraction",
                 "filesystem"
             ],
-            "time": "2017-03-03T13:41:53+00:00"
+            "time": "2017-03-27T08:48:46+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -1928,19 +2292,20 @@
         },
         {
             "name": "sensiolabs/security-checker",
-            "version": "v4.0.2",
+            "version": "v4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/security-checker.git",
-                "reference": "56bded66985e22f6eac2cf86735fd21c625bff2f"
+                "reference": "9e69eddf3bc49d1ee5c7908564da3141796d4bbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/56bded66985e22f6eac2cf86735fd21c625bff2f",
-                "reference": "56bded66985e22f6eac2cf86735fd21c625bff2f",
+                "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/9e69eddf3bc49d1ee5c7908564da3141796d4bbc",
+                "reference": "9e69eddf3bc49d1ee5c7908564da3141796d4bbc",
                 "shasum": ""
             },
             "require": {
+                "composer/ca-bundle": "^1.0",
                 "symfony/console": "~2.7|~3.0"
             },
             "bin": [
@@ -1968,7 +2333,7 @@
                 }
             ],
             "description": "A security checker for your composer.lock",
-            "time": "2017-03-09T17:33:20+00:00"
+            "time": "2017-03-31T14:50:32+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -2482,16 +2847,16 @@
         },
         {
             "name": "symfony/symfony",
-            "version": "v3.2.6",
+            "version": "v3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/symfony.git",
-                "reference": "b0f8a7fa4b8baadf9db299cb6ac87c96a8977dbe"
+                "reference": "1631040ea8fc5e0e405c00d35cbf2c0b7b555f64"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/b0f8a7fa4b8baadf9db299cb6ac87c96a8977dbe",
-                "reference": "b0f8a7fa4b8baadf9db299cb6ac87c96a8977dbe",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/1631040ea8fc5e0e405c00d35cbf2c0b7b555f64",
+                "reference": "1631040ea8fc5e0e405c00d35cbf2c0b7b555f64",
                 "shasum": ""
             },
             "require": {
@@ -2622,7 +2987,7 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2017-03-10T18:35:48+00:00"
+            "time": "2017-04-05T12:52:29+00:00"
         },
         {
             "name": "twig/twig",
@@ -2690,49 +3055,59 @@
     "packages-dev": [
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.1.2",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "c7de769d7b44f2c9de68e1f678b65efd8126f60b"
+                "reference": "d6f17423412d33df6b69c9aaf12037b91703533b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c7de769d7b44f2c9de68e1f678b65efd8126f60b",
-                "reference": "c7de769d7b44f2c9de68e1f678b65efd8126f60b",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d6f17423412d33df6b69c9aaf12037b91703533b",
+                "reference": "d6f17423412d33df6b69c9aaf12037b91703533b",
                 "shasum": ""
             },
             "require": {
+                "doctrine/annotations": "^1.2",
                 "ext-tokenizer": "*",
                 "php": "^5.3.6 || >=7.0 <7.2",
                 "sebastian/diff": "^1.1",
-                "symfony/console": "^2.3 || ^3.0",
+                "symfony/console": "^2.4 || ^3.0",
                 "symfony/event-dispatcher": "^2.1 || ^3.0",
                 "symfony/filesystem": "^2.4 || ^3.0",
                 "symfony/finder": "^2.2 || ^3.0",
+                "symfony/options-resolver": "^2.6 || ^3.0",
                 "symfony/polyfill-php54": "^1.0",
                 "symfony/polyfill-php55": "^1.3",
+                "symfony/polyfill-php70": "^1.0",
                 "symfony/polyfill-xml": "^1.3",
                 "symfony/process": "^2.3 || ^3.0",
                 "symfony/stopwatch": "^2.5 || ^3.0"
             },
             "conflict": {
-                "hhvm": "<3.9"
+                "hhvm": "<3.18"
             },
             "require-dev": {
                 "gecko-packages/gecko-php-unit": "^2.0",
                 "justinrainbow/json-schema": "^5.0",
                 "phpunit/phpunit": "^4.5 || ^5.0",
                 "satooshi/php-coveralls": "^1.0",
-                "symfony/phpunit-bridge": "^3.2"
+                "symfony/phpunit-bridge": "^3.2.2"
             },
             "suggest": {
-                "ext-xml": "For better performance."
+                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
+                "ext-xml": "For better performance.",
+                "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
             },
             "bin": [
                 "php-cs-fixer"
             ],
             "type": "application",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "PhpCsFixer\\": "src/"
@@ -2753,7 +3128,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2017-03-15T17:13:07+00:00"
+            "time": "2017-03-31T16:16:30+00:00"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -2905,7 +3280,7 @@
         },
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v3.2.6",
+            "version": "v3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
diff --git a/gulpfile.js b/gulpfile.js
index 23cdc2d..5dfb49a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -4,6 +4,7 @@ var gulp = require('gulp'),
 gulp.task('css', function() {
     return gulp.src([
         'node_modules/semantic-ui/dist/semantic.css',
+        'node_modules/lightbox2/dist/css/lightbox.css',
         'app/Resources/assets/style/style.scss',
     ])
         .pipe(plugins.sass().on('error', plugins.sass.logError))
@@ -31,23 +32,35 @@ gulp.task('js', function() {
     return gulp.src([
         'node_modules/jquery/dist/jquery.js',
         'node_modules/semantic-ui/dist/semantic.js',
+        'node_modules/lightbox2/dist/js/lightbox.js',
         'app/Resources/assets/js/**.js',
+        'node_modules/three/examples/js/libs/stats.min.js'
     ])
         .pipe(plugins.concat('main.js'))
         .pipe(gulp.dest('web/resources/js'));
 });
 
-gulp.task('files', function () {
-    return gulp.src('node_modules/semantic-ui/dist/themes/**')
-        .pipe(plugins.newer('web/resources/css/themes'))
+gulp.task('files:semantic', function () {
+    return gulp.src(
+        'node_modules/semantic-ui/dist/themes/**'
+    )
         .pipe(gulp.dest('web/resources/css/themes'));
 });
 
+gulp.task('files:images', function () {
+    return gulp.src([
+        'node_modules/lightbox2/dist/images/**',
+        'app/Resources/assets/images/**'
+    ])
+        .pipe(gulp.dest('web/resources/images'));
+});
+
+
 gulp.task('watch', ['js', 'css', 'three'], function () {
     gulp.watch('app/Resources/assets/js/**.js' , ['js']);
-    gulp.watch('app/Resources/assets/style/**/*.sass' , ['css']);
+    gulp.watch('app/Resources/assets/style/**/*.scss' , ['css']);
 });
 
 gulp.task('default', function () {
-    return gulp.start(['files', 'js', 'css', 'three']);
+    return gulp.start(['files:semantic', 'files:images', 'js', 'css', 'three']);
 });
\ No newline at end of file
diff --git a/package.json b/package.json
index 4f3be88..54b9670 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "gulp-sass": "^2.3.2",
     "gulp-watch": "^4.3.11",
     "jquery": "^3.2.1",
+    "lightbox2": "^2.9.0",
     "semantic-ui": "^2.2.9",
     "three": "^0.84.0"
   },
diff --git a/src/AppBundle/Api/Client/Brickset/Brickset.php b/src/AppBundle/Api/Client/Brickset/Brickset.php
index 45746ea..62397f0 100644
--- a/src/AppBundle/Api/Client/Brickset/Brickset.php
+++ b/src/AppBundle/Api/Client/Brickset/Brickset.php
@@ -13,7 +13,6 @@ use AppBundle\Api\Exception\ApiException;
 use AppBundle\Api\Exception\AuthenticationFailedException;
 use AppBundle\Api\Exception\CallFailedException;
 use AppBundle\Api\Exception\EmptyResponseException;
-use Symfony\Component\Asset\Exception\LogicException;
 use Symfony\Component\Debug\Exception\ContextErrorException;
 
 class Brickset extends \SoapClient
@@ -47,6 +46,7 @@ class Brickset extends \SoapClient
         $this->apiKey = $apikey;
 
         $options['cache_wsdl'] = WSDL_CACHE_NONE;
+        $options['exceptions'] = true;
 
         foreach (self::$classmap as $key => $value) {
             if (!isset($options['classmap'][$key])) {
@@ -56,7 +56,12 @@ class Brickset extends \SoapClient
         if (!$wsdl) {
             $wsdl = self::WSDL;
         }
-        parent::__construct($wsdl, $options);
+
+        try {
+            parent::__construct($wsdl, $options);
+        } catch (\Exception $exception) {
+            throw new ApiException(ApiException::BRICKSET);
+        }
     }
 
     /**
@@ -73,11 +78,14 @@ class Brickset extends \SoapClient
 
         try {
             $this->checkApiKey();
+
             return $this->__soapCall($method, [$parameters])->{$method.'Result'};
         } catch (\SoapFault $e) {
             throw new CallFailedException(ApiException::BRICKSET);
         } catch (ContextErrorException $e) {
             throw new EmptyResponseException(ApiException::BRICKSET);
+        } catch (\Exception $e) {
+            throw new ApiException(ApiException::BRICKSET);
         }
     }
 
@@ -105,7 +113,7 @@ class Brickset extends \SoapClient
 
         $response = $this->call('getSets', $parameters)->sets;
 
-        return is_array($response) ? $response : [$response];
+        return is_array($response) ? $response : [$this->getSet($response->getSetID())];
     }
 
     /**
@@ -258,7 +266,7 @@ class Brickset extends \SoapClient
     {
         $parameters['apiKey'] = $this->apiKey;
 
-        if($this->__soapCall('checkKey', [$parameters])->checkKeyResult != 'OK') {
+        if ($this->__soapCall('checkKey', [$parameters])->checkKeyResult != 'OK') {
             throw new AuthenticationFailedException(ApiException::BRICKSET);
         }
     }
diff --git a/src/AppBundle/Api/Client/Rebrickable/Rebrickable_v3.php b/src/AppBundle/Api/Client/Rebrickable/Rebrickable_v3.php
index 97fa006..24d8667 100644
--- a/src/AppBundle/Api/Client/Rebrickable/Rebrickable_v3.php
+++ b/src/AppBundle/Api/Client/Rebrickable/Rebrickable_v3.php
@@ -9,7 +9,6 @@ use AppBundle\Api\Exception\EmptyResponseException;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\ConnectException;
-use Symfony\Component\Asset\Exception\LogicException;
 
 class Rebrickable_v3
 {
@@ -59,11 +58,11 @@ class Rebrickable_v3
         } catch (ClientException $e) {
             if ($e->getCode() == 404) {
                 throw new EmptyResponseException(ApiException::REBRICKABLE);
-            } else if ($e->getCode() == 401) {
+            } elseif ($e->getCode() == 401) {
                 throw new AuthenticationFailedException(ApiException::REBRICKABLE);
             }
 
-            throw new ApiException(ApiException::REBRICKABLE,$e,$e->getCode());
+            throw new ApiException(ApiException::REBRICKABLE, $e, $e->getCode());
         }
     }
 }
diff --git a/src/AppBundle/Api/Manager/BricksetManager.php b/src/AppBundle/Api/Manager/BricksetManager.php
index bda8f33..805eaa7 100644
--- a/src/AppBundle/Api/Manager/BricksetManager.php
+++ b/src/AppBundle/Api/Manager/BricksetManager.php
@@ -47,4 +47,19 @@ class BricksetManager
 
         return isset($sets[0]) ? $sets[0] : null;
     }
+
+    public function getSetInstructions($id)
+    {
+        return $this->bricksetClient->getInstructions($id);
+    }
+
+    public function getSetReviews($id)
+    {
+        return $this->bricksetClient->getReviews($id);
+    }
+
+    public function getAdditionalImages($id)
+    {
+        return $this->bricksetClient->getAdditionalImages($id);
+    }
 }
diff --git a/src/AppBundle/Api/Manager/RebrickableManager.php b/src/AppBundle/Api/Manager/RebrickableManager.php
index 8fc528f..622e020 100644
--- a/src/AppBundle/Api/Manager/RebrickableManager.php
+++ b/src/AppBundle/Api/Manager/RebrickableManager.php
@@ -119,18 +119,19 @@ class RebrickableManager
         return $this->serializer->deserialize($data, PartCategory::class, self::FORMAT);
     }
 
-    public function getPartsByLDrawNumber($number) {
+    public function getPartsByLDrawNumber($number)
+    {
         $options = [
             'query' => [
-                'ldraw_id' => $number
+                'ldraw_id' => $number,
             ],
         ];
 
-        $response = $this->rebrickableClient->call('GET','lego/parts', $options);
+        $response = $this->rebrickableClient->call('GET', 'lego/parts', $options);
 
         $data = json_decode($response, true)['results'];
 
-        return $this->serializer->denormalize($data,Part::class.'[]',self::FORMAT);
+        return $this->serializer->denormalize($data, Part::class.'[]', self::FORMAT);
     }
 
     /**
diff --git a/src/AppBundle/Command/LoadLDRawLibraryCommand.php b/src/AppBundle/Command/LoadLDRawLibraryCommand.php
deleted file mode 100644
index 0d94f07..0000000
--- a/src/AppBundle/Command/LoadLDRawLibraryCommand.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace AppBundle\Command;
-
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class LoadLDRawLibraryCommand extends ContainerAwareCommand
-{
-    protected function configure()
-    {
-        $this
-            ->setName('app:load:ldraw')
-            ->setDescription('Loads LDraw library parts')
-            ->setHelp('This command allows you to..')
-            ->addArgument('ldraw_path', InputArgument::OPTIONAL, 'Path to LDraw library folder');
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $ldrawLoader = $this->getContainer()->get('service.loader.ldraw');
-        $ldrawLoader->setOutput($output);
-
-        //TODO log errors
-
-        try {
-            // TODO handle relative path to dir
-            if (($ldrawPath = $input->getArgument('ldraw_path')) == null) {
-                $ldrawPath = $ldrawLoader->downloadLibrary();
-            }
-
-            $ldrawLoader->loadData($ldrawPath);
-        } catch (\Exception $e) {
-            printf($e->getMessage());
-        }
-    }
-}
diff --git a/src/AppBundle/Command/LoadModelsCommand.php b/src/AppBundle/Command/LoadModelsCommand.php
new file mode 100644
index 0000000..c115440
--- /dev/null
+++ b/src/AppBundle/Command/LoadModelsCommand.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace AppBundle\Command;
+
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\LockableTrait;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class LoadModelsCommand extends ContainerAwareCommand
+{
+    use LockableTrait;
+
+    protected function configure()
+    {
+        $this
+            ->setName('app:load:models')
+            ->setDescription('Loads LDraw library models into database')
+            ->setHelp('This command allows you to load LDraw library models into database while converting .dat files to .stl format.')
+            ->setDefinition(
+                new InputDefinition([
+                    new InputArgument('ldraw', InputArgument::REQUIRED, 'Path to LDraw library directory'),
+//                    new InputOption('images', 'i', InputOption::VALUE_NONE, 'Do you want to generate images of models?'),
+                    new InputOption('all', 'a', InputOption::VALUE_NONE, 'Load all models from LDraw libary folder (/parts directory)'),
+                    new InputOption('file', 'f', InputOption::VALUE_REQUIRED, 'Load single modle into database'),
+                    new InputOption('update', 'u', InputOption::VALUE_NONE, 'Overwrite already loaded models'),
+                ])
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        if (!$this->lock()) {
+            $output->writeln('The command is already running in another process.');
+
+            return 0;
+        }
+
+        $modelLoader = $this->getContainer()->get('service.loader.model');
+        $modelLoader->setOutput($output);
+        $modelLoader->setRewite($input->getOption('update'));
+
+        $ldraw = $input->getArgument('ldraw');
+
+        if ($ldrawPath = realpath($ldraw)) {
+            $modelLoader->setLDrawLibraryContext($ldrawPath);
+
+            if (($path = $input->getOption('file')) != null) {
+                if ($file = realpath($path)) {
+                    $output->writeln([
+                        'Loading model',
+                        'path: '.$file,
+                        '------------------------------------------------------------------------------',
+                    ]);
+
+                    $modelLoader->loadOneModel($file);
+
+                    $errorCount = $this->getContainer()->get('monolog.logger.loader')->countErrors();
+                    $errors = $errorCount ? '<error>'.$errorCount.'</error>' : '<info>0</info>';
+
+                    $output->writeln(['Done with "'.$errors.'" errors.']);
+                } else {
+                    $output->writeln("File $path not found");
+                }
+            }
+
+            // Load all models inside ldraw/parts directory
+            if ($input->getOption('all')) {
+                $output->writeln([
+                    'Loading models from LDraw library: <comment>'.$ldrawPath.'</comment>',
+                ]);
+
+                $modelLoader->loadAllModels();
+
+                $errorCount = $this->getContainer()->get('monolog.logger.loader')->countErrors();
+                $errors = $errorCount ? '<error>'.$errorCount.'</error>' : '<info>0</info>';
+
+                $output->writeln(['Done with "'.$errors.'" errors.']);
+            }
+        } else {
+            $output->writeln($ldraw.' is not valid path');
+        }
+
+        $this->release();
+    }
+}
diff --git a/src/AppBundle/Command/LoadRebrickableDataCommand.php b/src/AppBundle/Command/LoadRebrickableDataCommand.php
index a9c441e..71d7135 100644
--- a/src/AppBundle/Command/LoadRebrickableDataCommand.php
+++ b/src/AppBundle/Command/LoadRebrickableDataCommand.php
@@ -12,8 +12,8 @@ class LoadRebrickableDataCommand extends ContainerAwareCommand
     {
         $this
             ->setName('app:load:rebrickable')
-            ->setDescription('Loads Rebrickable database')
-            ->setHelp('This command allows you to..');
+            ->setDescription('Loads Rebrickable data about sets and parts into database.')
+            ->setHelp('This command allows you to load Rebrickable CSV files containing information about sets and parts into database.');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
diff --git a/src/AppBundle/Command/LoadRelationCommand.php b/src/AppBundle/Command/LoadRelationCommand.php
index bffaaf8..d90ebeb 100644
--- a/src/AppBundle/Command/LoadRelationCommand.php
+++ b/src/AppBundle/Command/LoadRelationCommand.php
@@ -12,8 +12,8 @@ class LoadRelationCommand extends ContainerAwareCommand
     {
         $this
             ->setName('app:load:relations')
-            ->setDescription('Loads relations between LDraw models and Rebrickable parts')
-            ->setHelp('This command allows you to..');
+            ->setDescription('Loads relations between LDraw models and Rebrickable parts.')
+            ->setHelp('This command allows you to load relation between models and parts into database.');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
diff --git a/src/AppBundle/Controller/Brickset/SetController.php b/src/AppBundle/Controller/Brickset/SetController.php
index b55910b..25336ee 100644
--- a/src/AppBundle/Controller/Brickset/SetController.php
+++ b/src/AppBundle/Controller/Brickset/SetController.php
@@ -1,10 +1,8 @@
 <?php
 
-namespace AppBundle\Controller\Rebrickable;
+namespace AppBundle\Controller\Brickset;
 
-use AppBundle\Entity\Rebrickable\Color;
-use AppBundle\Entity\Rebrickable\Inventory_Part;
-use AppBundle\Entity\Rebrickable\Part;
+use AppBundle\Api\Exception\EmptyResponseException;
 use AppBundle\Entity\Rebrickable\Set;
 use AppBundle\Entity\Rebrickable\Theme;
 use AppBundle\Form\FilterSetType;
@@ -13,12 +11,12 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * @Route("/brickset")
+ * @Route("/brickset/sets")
  */
 class SetController extends Controller
 {
     /**
-     * @Route("/", name="set_browse")
+     * @Route("/", name="brickset_browse")
      */
     public function browseAction(Request $request)
     {
@@ -30,11 +28,17 @@ class SetController extends Controller
         if ($form->isSubmitted() && $form->isValid()) {
             $data = $form->getData();
 
-            $sets = $this->get('api.client.brickset')->getSets([
-                'theme' => $data['theme'] ? $data['theme']->getTheme() : '',
-                'subtheme' => $data['subtheme'] ? $data['subtheme']->getSubtheme() : '',
-                'year' => $data['years'] ? $data['years']->getYear() : '',
-            ]);
+            try {
+                $sets = $this->get('api.client.brickset')->getSets([
+                    'theme' => $data['theme'] ? $data['theme']->getTheme() : '',
+                    'subtheme' => $data['subtheme'] ? $data['subtheme']->getSubtheme() : '',
+                    'year' => $data['years'] ? $data['years']->getYear() : '',
+                ]);
+            } catch (EmptyResponseException $e) {
+                $this->addFlash('warning', 'No set found on '.$e->getService());
+            } catch (\Exception $e) {
+                $this->addFlash('error', $e->getMessage());
+            }
         }
 
         return $this->render('brickset/browse.html.twig', [
@@ -42,4 +46,61 @@ class SetController extends Controller
             'sets' => $sets,
         ]);
     }
+
+    /**
+     * @Route("/{id}/instructions", name="brickset_instructions")
+     */
+    public function instructionsAction(Request $request, $id)
+    {
+        $instructions = [];
+        try {
+            $instructions = $this->get('api.manager.brickset')->getSetInstructions($id);
+        } catch (EmptyResponseException $e) {
+            //            $this->addFlash('warning', 'No instruction found on Brickset.com');
+        } catch (\Exception $e) {
+            $this->addFlash('error', $e->getMessage());
+        }
+
+        return $this->render('brickset/instructions.html.twig', [
+            'instructions' => $instructions,
+        ]);
+    }
+
+    /**
+     * @Route("/{id}/reviews", name="brickset_reviews")
+     */
+    public function reviewsAction(Request $request, $id)
+    {
+        $reviews = [];
+        try {
+            $reviews = $this->get('api.manager.brickset')->getSetReviews($id);
+        } catch (EmptyResponseException $e) {
+            //            $this->addFlash('warning', 'No review found on Brickset.com');
+        } catch (\Exception $e) {
+            $this->addFlash('error', $e->getMessage());
+        }
+
+        return $this->render('brickset/reviews.html.twig', [
+            'reviews' => $reviews,
+        ]);
+    }
+
+    /**
+     * @Route("/{id}/images", name="brickset_images")
+     */
+    public function imagesAction(Request $request, $id)
+    {
+        $images = [];
+        try {
+            $images = $this->get('api.manager.brickset')->getAdditionalImages($id);
+        } catch (EmptyResponseException $e) {
+            //            $this->addFlash('warning', 'No images found on Brickset.com');
+        } catch (\Exception $e) {
+            $this->addFlash('error', $e->getMessage());
+        }
+
+        return $this->render('brickset/images.html.twig', [
+            'images' => $images,
+        ]);
+    }
 }
diff --git a/src/AppBundle/Controller/MediaController.php b/src/AppBundle/Controller/MediaController.php
index 83923e3..8ec06c8 100644
--- a/src/AppBundle/Controller/MediaController.php
+++ b/src/AppBundle/Controller/MediaController.php
@@ -2,7 +2,6 @@
 
 namespace AppBundle\Controller;
 
-use AppBundle\Entity\LDraw\Model;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
@@ -11,59 +10,33 @@ use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * @Route("/media")
+ * @Route("/files")
  */
 class MediaController extends Controller
 {
     /**
-     * @Route("/model/stl/{number}", name="model_stl")
+     * @Route("/{path}", name="media_file", requirements={"path"=".+"})
      *
      * @return Response
      */
-    public function stlAction(Model $model)
+    public function stlAction($path)
     {
         $mediaFilesystem = $this->get('oneup_flysystem.media_filesystem');
 
-        if ($mediaFilesystem->has($model->getPath())) {
-            $response = new BinaryFileResponse($mediaFilesystem->getAdapter()->getPathPrefix().DIRECTORY_SEPARATOR.$model->getPath());
-            $response->headers->set('Content-Type', 'application/vnd.ms-pki.stl');
+        if ($mediaFilesystem->has($path)) {
+            $response = new BinaryFileResponse($mediaFilesystem->getAdapter()->getPathPrefix().DIRECTORY_SEPARATOR.$path);
+            $response->headers->set('Content-Type', $mediaFilesystem->getMimetype($path));
 
             // Create the disposition of the file
             $disposition = $response->headers->makeDisposition(
                 ResponseHeaderBag::DISPOSITION_ATTACHMENT,
-                $model->getNumber().'.stl'
+                basename($path)
             );
 
             $response->headers->set('Content-Disposition', $disposition);
 
             return $response;
         }
-        throw new FileNotFoundException($model->getPath());
-    }
-
-    /**
-     * @Route("/model/image/{number}", name="model_image")
-     *
-     * @return Response
-     */
-    public function imageAction(Model $model)
-    {
-        $mediaFilesystem = $this->get('oneup_flysystem.media_filesystem');
-
-        if ($mediaFilesystem->has('ldraw'.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.$model->getNumber().'.png')) {
-            $response = new BinaryFileResponse($mediaFilesystem->getAdapter()->getPathPrefix().DIRECTORY_SEPARATOR.'ldraw'.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.$model->getNumber().'.png');
-            $response->headers->set('Content-Type', 'image/png');
-
-            // Create the disposition of the file
-            $disposition = $response->headers->makeDisposition(
-                ResponseHeaderBag::DISPOSITION_ATTACHMENT,
-                $model->getNumber().'png'
-            );
-
-            $response->headers->set('Content-Disposition', $disposition);
-
-            return $response;
-        }
-        throw new FileNotFoundException($model->getNumber().'png');
+        throw new FileNotFoundException($path);
     }
 }
diff --git a/src/AppBundle/Controller/LDraw/ModelController.php b/src/AppBundle/Controller/ModelController.php
similarity index 74%
rename from src/AppBundle/Controller/LDraw/ModelController.php
rename to src/AppBundle/Controller/ModelController.php
index e607afc..329cd68 100644
--- a/src/AppBundle/Controller/LDraw/ModelController.php
+++ b/src/AppBundle/Controller/ModelController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace AppBundle\Controller\LDraw;
+namespace AppBundle\Controller;
 
 use AppBundle\Entity\LDraw\Model;
 use AppBundle\Entity\Rebrickable\Part;
 use AppBundle\Entity\Rebrickable\Set;
-use AppBundle\Form\Filter\ModelFilterType;
+use AppBundle\Form\Filter\Model\ModelFilterType;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -14,24 +14,21 @@ use Symfony\Component\HttpFoundation\Request;
 /**
  * Part controller.
  *
- * @Route("ldraw")
+ * @Route("models")
  */
 class ModelController extends Controller
 {
     /**
      * Lists all part entities.
      *
-     * @Route("/models/", name="ldraw_model_index")
+     * @Route("/", name="model_index")
      * @Method("GET")
      */
     public function indexAction(Request $request)
     {
-        $em = $this->getDoctrine()->getManager();
-
         $form = $this->get('form.factory')->create(ModelFilterType::class);
 
-        $filterBuilder = $this->get('repository.ldraw.model')
-            ->createQueryBuilder('model');
+        $filterBuilder = $this->get('repository.ldraw.model')->getFilteredQueryBuilder();
 
         if ($request->query->has($form->getName())) {
             // manually bind values from the request
@@ -45,10 +42,10 @@ class ModelController extends Controller
         $models = $paginator->paginate(
             $filterBuilder->getQuery(),
             $request->query->getInt('page', 1)/*page number*/,
-            $request->query->getInt('limit', 100)/*limit per page*/
+            $request->query->getInt('limit', 40)/*limit per page*/
         );
 
-        return $this->render('ldraw/model/index.html.twig', [
+        return $this->render('model/index.html.twig', [
             'models' => $models,
             'form' => $form->createView(),
         ]);
@@ -57,27 +54,29 @@ class ModelController extends Controller
     /**
      * Finds and displays a part entity.
      *
-     * @Route("/models/{number}", name="model_detail")
+     * @Route("/{number}", name="model_detail")
      * @Method("GET")
      */
     public function detailAction($number)
     {
         $em = $this->getDoctrine()->getManager();
 
-        if($model = $this->get('manager.ldraw.model')->findByNumber($number)) {
+        if ($model = $this->get('repository.ldraw.model')->findOneByNumber($number)) {
             try {
                 $rbParts = $model != null ? $em->getRepository(Part::class)->findAllByModel($model) : null;
                 $sets = $model != null ? $em->getRepository(Set::class)->findAllByModel($model) : null;
 
-                return $this->render('ldraw/model/detail.html.twig', [
+                $related = $em->getRepository(Model::class)->findAllRelatedModels($model->getNumber());
+
+                return $this->render('model/detail.html.twig', [
                     'model' => $model,
                     'rbParts' => $rbParts,
                     'sets' => $sets,
+                    'related' => $related,
                 ]);
             } catch (\Exception $e) {
                 $this->addFlash('error', $e->getMessage());
             }
-
         }
 
         return $this->render('error/error.html.twig');
diff --git a/src/AppBundle/Controller/Rebrickable/ColorController.php b/src/AppBundle/Controller/Rebrickable/ColorController.php
index 6b0b8ad..518f862 100644
--- a/src/AppBundle/Controller/Rebrickable/ColorController.php
+++ b/src/AppBundle/Controller/Rebrickable/ColorController.php
@@ -3,8 +3,8 @@
 namespace AppBundle\Controller\Rebrickable;
 
 use AppBundle\Entity\Rebrickable\Color;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 /**
  * Part controller.
@@ -14,10 +14,10 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 class ColorController extends Controller
 {
     /**
-     *
      * @Route("/", name="color_index")
      */
-    public function indexAction() {
+    public function indexAction()
+    {
         $em = $this->getDoctrine()->getManager();
 
         $colors = $em->getRepository(Color::class)->findAll();
@@ -26,4 +26,4 @@ class ColorController extends Controller
             'colors' => $colors,
         ]);
     }
-}
\ No newline at end of file
+}
diff --git a/src/AppBundle/Controller/Rebrickable/PartController.php b/src/AppBundle/Controller/Rebrickable/PartController.php
index 189d329..421251c 100644
--- a/src/AppBundle/Controller/Rebrickable/PartController.php
+++ b/src/AppBundle/Controller/Rebrickable/PartController.php
@@ -3,11 +3,13 @@
 namespace AppBundle\Controller\Rebrickable;
 
 use AppBundle\Api\Exception\EmptyResponseException;
+use AppBundle\Entity\Rebrickable\Category;
 use AppBundle\Entity\Rebrickable\Part;
 use AppBundle\Entity\Rebrickable\Set;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Part controller.
@@ -16,19 +18,41 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
  */
 class PartController extends Controller
 {
+    /**
+     * @Route("/", name="part_index")
+     */
+    public function indexAction(Request $request)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $queryBuilder = $em->getRepository(Part::class)->createQueryBuilder('part');
+        $queryBuilder->where('part.category = 17');
+
+        $paginator = $this->get('knp_paginator');
+        $sets = $paginator->paginate(
+            $queryBuilder->getQuery(),
+            $request->query->getInt('page', 1)/*page number*/,
+            $request->query->getInt('limit', 30)/*limit per page*/
+        );
+
+        return $this->render(':rebrickable/part:index.html.twig', [
+            'parts' => $sets,
+        ]);
+    }
+
     /**
      * Finds and displays a part entity.
      *
-     * @Route("/{number}", name="rebrickable_part_show")
+     * @Route("/{number}", name="reb_part_detail")
      * @Method("GET")
      */
-    public function showAction(Part $part = null)
+    public function detailAction(Part $part)
     {
         $em = $this->getDoctrine()->getManager();
 
         $apiPart = null;
 
-        if($part) {
+        if ($part) {
             try {
                 $apiPart = $this->get('api.manager.rebrickable')->getPart($part->getNumber());
             } catch (EmptyResponseException $e) {
diff --git a/src/AppBundle/Controller/Rebrickable/SetController.php b/src/AppBundle/Controller/Rebrickable/SetController.php
index 9cca944..04f74df 100644
--- a/src/AppBundle/Controller/Rebrickable/SetController.php
+++ b/src/AppBundle/Controller/Rebrickable/SetController.php
@@ -2,17 +2,13 @@
 
 namespace AppBundle\Controller\Rebrickable;
 
-use AppBundle\Api\Exception\EmptyResponseException;
-use AppBundle\Entity\LDraw\Model;
 use AppBundle\Entity\Rebrickable\Color;
 use AppBundle\Entity\Rebrickable\Inventory_Part;
+use AppBundle\Entity\Rebrickable\Inventory_Set;
 use AppBundle\Entity\Rebrickable\Part;
 use AppBundle\Entity\Rebrickable\Set;
-use AppBundle\Entity\Rebrickable\Theme;
-use AppBundle\Form\FilterSetType;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -21,87 +17,46 @@ use Symfony\Component\HttpFoundation\Response;
 class SetController extends Controller
 {
     /**
-     * @Route("/", name="set_index")
+     * @Route("/{number}/parts", name="rebrickable_set_parts")
      */
-    public function indexAction(Request $request)
+    public function partsAction(Set $set)
     {
         $em = $this->getDoctrine()->getManager();
 
-        $qb = $em->getRepository(Set::class)->createQueryBuilder('s');
-
-        $paginator = $this->get('knp_paginator');
-        $sets = $paginator->paginate(
-            $qb->getQuery(),
-            $request->query->getInt('page', 1)/*page number*/,
-            $request->query->getInt('limit', 30)/*limit per page*/
-        );
-
-        return $this->render('rebrickable/set/index.html.twig', [
-            'sets' => $sets,
-        ]);
-    }
-
-    /**
-     * @Route("/detail/{number}_{name}", name="set_detail")
-     */
-    public function detailAction(Request $request, $number, $name = null)
-    {
-        $brset = null;
-        try {
-            $brset = $this->get('api.manager.brickset')->getSetByNumber($number);
-        } catch (EmptyResponseException $e) {
-            $this->addFlash('warning', 'Set not found in Brickset database');
-        } catch (\Exception $e) {
-            $this->addFlash('error', $e->getMessage());
-        }
-
-        $set = $this->getDoctrine()->getManager()->getRepository(Set::class)->find($number);
-
-        $rbset = $this->get('api.manager.rebrickable')->getSet($number);
-
-        $em = $this->getDoctrine()->getManager();
         $em->getRepository(Color::class)->findAll();
-        $em->getRepository(Theme::class)->findAll();
+        $em->getRepository(Part::class)->findAllBySetNumber($set->getNumber());
 
-        return $this->render('rebrickable/set/detail.html.twig', [
-            'set' => $set,
-            'brset' => $brset,
-            'rbset' => $rbset,
-            'parts' => $em->getRepository(Model::class)->findAllBySetNumber($number),
-            'inventoryParts' => $em->getRepository(Inventory_Part::class)->findAllBySetNumber($number),
+        $regularParts = $em->getRepository(Inventory_Part::class)->findAllRegularBySetNumber($set->getNumber());
+        $spareParts = $em->getRepository(Inventory_Part::class)->findAllSpareBySetNumber($set->getNumber());
+
+        $template = $this->render('rebrickable/set/parts.html.twig', [
+            'regularParts' => $regularParts,
+            'spareParts' => $spareParts,
         ]);
+
+        $json = json_encode($template->getContent());
+        $response = new Response($json, 200);
+        $response->headers->set('Content-Type', 'application/json');
+
+        return $response;
     }
 
-
     /**
-     * @Route("/download/{number}", name="set_download")
+     * @Route("/{number}/sets", name="rebrickable_set_sets")
      */
-    public function downloadZipAction(Request $request, $number) {
+    public function setsAction(Set $set)
+    {
         $em = $this->getDoctrine()->getManager();
 
-        $inventoryParts = $em->getRepository(Inventory_Part::class)->findAllBySetNumber($number);
+        $inventorySets = $em->getRepository(Inventory_Set::class)->findAllBySetNumber($set->getNumber());
 
-        $zip = new \ZipArchive();
-        $zipName = 'set_'.$number.'.zip';
-        $zip->open($zipName,  \ZipArchive::CREATE);
-        /** @var Inventory_Part $part */
-        foreach ($inventoryParts as $part) {
-            $filename = $part->getPart()->getNumber().'_('.$part->getColor()->getName().'_'.$part->getQuantity().'x).stl';
+        $template = $this->render('rebrickable/set/sets.html.twig', [
+            'inventorySets' => $inventorySets,
+        ]);
 
-            try {
-                if($part->getPart()->getModel()) {
-                    $zip->addFromString($filename, $this->get('oneup_flysystem.media_filesystem')->read($part->getPart()->getModel()->getPath()));
-                }
-            } catch (\Exception $e) {
-                dump($e);
-            }
-        }
-        $zip->close();
-
-        $response = new Response(file_get_contents($zipName));
-        $response->headers->set('Content-Type', 'application/zip');
-        $response->headers->set('Content-Disposition', 'attachment;filename="' . $zipName . '"');
-        $response->headers->set('Content-length', filesize($zipName));
+        $json = json_encode($template->getContent());
+        $response = new Response($json, 200);
+        $response->headers->set('Content-Type', 'application/json');
 
         return $response;
     }
diff --git a/src/AppBundle/Controller/SetController.php b/src/AppBundle/Controller/SetController.php
new file mode 100644
index 0000000..0413212
--- /dev/null
+++ b/src/AppBundle/Controller/SetController.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace AppBundle\Controller;
+
+use AppBundle\Api\Exception\ApiException;
+use AppBundle\Api\Exception\EmptyResponseException;
+use AppBundle\Entity\Rebrickable\Inventory_Part;
+use AppBundle\Entity\Rebrickable\Set;
+use AppBundle\Form\Filter\Set\SetFilterType;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * @Route("/sets")
+ */
+class SetController extends Controller
+{
+    /**
+     * @Route("/", name="set_index")
+     */
+    public function indexAction(Request $request)
+    {
+        $form = $this->get('form.factory')->create(SetFilterType::class);
+
+        $filterBuilder = $this->get('repository.rebrickable.set')
+            ->createQueryBuilder('s');
+
+        if ($request->query->has($form->getName())) {
+            // manually bind values from the request
+            $form->submit($request->query->get($form->getName()));
+
+            // build the query from the given form object
+            $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $filterBuilder);
+        }
+
+        $paginator = $this->get('knp_paginator');
+        $sets = $paginator->paginate(
+            $filterBuilder->getQuery(),
+            $request->query->getInt('page', 1)/*page number*/,
+            $request->query->getInt('limit', 30)/*limit per page*/
+        );
+
+        return $this->render('set/index.html.twig', [
+            'sets' => $sets,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * @Route("/{number}", name="set_detail")
+     */
+    public function detailAction(Request $request, $number)
+    {
+        $rebrickableSet = null;
+        $bricksetSet = null;
+        try {
+            if (($rebrickableSet = $this->getDoctrine()->getManager()->getRepository(Set::class)->find($number)) == null) {
+                $this->addFlash('warning', 'Set not found in Rebrickable database');
+            }
+
+            $bricksetSet = $this->get('api.manager.brickset')->getSetByNumber($number);
+            dump($bricksetSet);
+        } catch (EmptyResponseException $e) {
+            $this->addFlash('warning', 'Set not found in Brickset database');
+        } catch (ApiException $e) {
+            $this->addFlash('error', $e->getService());
+        } catch (\Exception $e) {
+            $this->addFlash('error', $e->getMessage());
+        }
+
+        if (!$rebrickableSet && !$bricksetSet) {
+            return $this->render('error/error.html.twig');
+        }
+
+        return $this->render('set/detail.html.twig', [
+            'rbset' => $rebrickableSet,
+            'brset' => $bricksetSet,
+        ]);
+    }
+}
diff --git a/src/AppBundle/Entity/LDraw/Alias.php b/src/AppBundle/Entity/LDraw/Alias.php
index 3be0904..97b6f46 100644
--- a/src/AppBundle/Entity/LDraw/Alias.php
+++ b/src/AppBundle/Entity/LDraw/Alias.php
@@ -18,7 +18,7 @@ class Alias
     /**
      * @var Model
      *
-     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\LDraw\Model", inversedBy="aliases", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\LDraw\Model", inversedBy="aliases")
      */
     private $model;
 
diff --git a/src/AppBundle/Entity/LDraw/Author.php b/src/AppBundle/Entity/LDraw/Author.php
new file mode 100644
index 0000000..9d87c02
--- /dev/null
+++ b/src/AppBundle/Entity/LDraw/Author.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace AppBundle\Entity\LDraw;
+
+use AppBundle\Entity\Traits\IdentityTrait;
+use AppBundle\Entity\Traits\UniqueNameTrait;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Author.
+ *
+ * @ORM\Table(name="ldraw_author")
+ * @ORM\Entity(repositoryClass="AppBundle\Repository\LDraw\AuthorRepository")
+ */
+class Author
+{
+    use IdentityTrait;
+    use UniqueNameTrait;
+
+    /**
+     * @var Author
+     *
+     * @ORM\OneToMany(targetEntity="AppBundle\Entity\LDraw\Model", mappedBy="author")
+     */
+    private $models;
+
+    /**
+     * @return Author
+     */
+    public function getModels()
+    {
+        return $this->models;
+    }
+}
diff --git a/src/AppBundle/Entity/LDraw/Category.php b/src/AppBundle/Entity/LDraw/Category.php
index 549c804..10dda36 100644
--- a/src/AppBundle/Entity/LDraw/Category.php
+++ b/src/AppBundle/Entity/LDraw/Category.php
@@ -3,7 +3,7 @@
 namespace AppBundle\Entity\LDraw;
 
 use AppBundle\Entity\Traits\IdentityTrait;
-use AppBundle\Entity\Traits\NameTrait;
+use AppBundle\Entity\Traits\UniqueNameTrait;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -17,7 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
 class Category
 {
     use IdentityTrait;
-    use NameTrait;
+    use UniqueNameTrait;
 
     /**
      * @var Collection
diff --git a/src/AppBundle/Entity/LDraw/Keyword.php b/src/AppBundle/Entity/LDraw/Keyword.php
index 1a57071..85aeea3 100644
--- a/src/AppBundle/Entity/LDraw/Keyword.php
+++ b/src/AppBundle/Entity/LDraw/Keyword.php
@@ -3,7 +3,7 @@
 namespace AppBundle\Entity\LDraw;
 
 use AppBundle\Entity\Traits\IdentityTrait;
-use AppBundle\Entity\Traits\NameTrait;
+use AppBundle\Entity\Traits\UniqueNameTrait;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 
@@ -16,7 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 class Keyword
 {
     use IdentityTrait;
-    use NameTrait;
+    use UniqueNameTrait;
 
     /**
      * @var ArrayCollection
diff --git a/src/AppBundle/Entity/LDraw/Model.php b/src/AppBundle/Entity/LDraw/Model.php
index fb7e90a..e770b2b 100644
--- a/src/AppBundle/Entity/LDraw/Model.php
+++ b/src/AppBundle/Entity/LDraw/Model.php
@@ -17,13 +17,6 @@ class Model
 {
     use NumberTrait;
 
-    /**
-     * @var Type
-     *
-     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\LDraw\Type", inversedBy="models", cascade={"persist"})
-     */
-    private $type;
-
     /**
      * @var string
      *
@@ -48,7 +41,7 @@ class Model
     /**
      * @var ArrayCollection
      *
-     * @ORM\OneToMany(targetEntity="AppBundle\Entity\LDraw\Subpart", mappedBy="parent")
+     * @ORM\OneToMany(targetEntity="AppBundle\Entity\LDraw\Subpart", mappedBy="parent", cascade={"persist"})
      */
     private $subparts;
 
@@ -74,9 +67,9 @@ class Model
     private $path;
 
     /**
-     * @var string
+     * @var Author
      *
-     * @ORM\Column(type="string", length=255, nullable=true)
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\LDraw\Author", cascade={"persist"}, inversedBy="models")
      */
     private $author;
 
@@ -122,7 +115,7 @@ class Model
     /**
      * Set author.
      *
-     * @param string $author
+     * @param Author $author
      *
      * @return Model
      */
@@ -136,7 +129,7 @@ class Model
     /**
      * Get author.
      *
-     * @return string
+     * @return Author
      */
     public function getAuthor()
     {
@@ -163,22 +156,6 @@ class Model
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @param string $type
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-    }
-
     /**
      * @return string
      */
@@ -292,6 +269,20 @@ class Model
         return $this;
     }
 
+    /**
+     * @param Subpart $subpart
+     *
+     * @return $this
+     */
+    public function addSubpart($subpart)
+    {
+        if (!$this->subparts->contains($subpart)) {
+            $this->subparts->add($subpart);
+        }
+
+        return $this;
+    }
+
     /**
      * @return ArrayCollection
      */
diff --git a/src/AppBundle/Entity/LDraw/Subpart.php b/src/AppBundle/Entity/LDraw/Subpart.php
index 71b42b0..ba8c605 100644
--- a/src/AppBundle/Entity/LDraw/Subpart.php
+++ b/src/AppBundle/Entity/LDraw/Subpart.php
@@ -16,7 +16,7 @@ class Subpart
      * @var Model
      *
      * @ORM\Id
-     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\LDraw\Model", inversedBy="subparts", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\LDraw\Model", inversedBy="subparts")
      */
     private $parent;
 
diff --git a/src/AppBundle/Entity/LDraw/Type.php b/src/AppBundle/Entity/LDraw/Type.php
deleted file mode 100644
index c33ea34..0000000
--- a/src/AppBundle/Entity/LDraw/Type.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace AppBundle\Entity\LDraw;
-
-use AppBundle\Entity\Traits\IdentityTrait;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * Type.
- *
- * @ORM\Table(name="ldraw_type")
- * @ORM\Entity(repositoryClass="AppBundle\Repository\LDraw\TypeRepository")
- */
-class Type
-{
-    use IdentityTrait;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=60, unique=true)
-     */
-    private $name;
-
-    /**
-     * @var Collection
-     *
-     * @ORM\OneToMany(targetEntity="Model", mappedBy="type")
-     */
-    private $models;
-
-    /**
-     * BuildingKit constructor.
-     */
-    public function __construct()
-    {
-        $this->models = new ArrayCollection();
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * Get models.
-     *
-     * @return ArrayCollection
-     */
-    public function getModels()
-    {
-        return $this->models;
-    }
-
-    /**
-     * @param Model $model
-     *
-     * @return Type
-     */
-    public function addModel(Model $model)
-    {
-        $this->models->add($model);
-
-        return $this;
-    }
-
-    /**
-     * @param Model $model
-     *
-     * @return Type
-     */
-    public function removeModel(Model $model)
-    {
-        $this->models->remove($model);
-
-        return $this;
-    }
-}
diff --git a/src/AppBundle/Entity/Rebrickable/Inventory.php b/src/AppBundle/Entity/Rebrickable/Inventory.php
index 36777df..d04c23f 100644
--- a/src/AppBundle/Entity/Rebrickable/Inventory.php
+++ b/src/AppBundle/Entity/Rebrickable/Inventory.php
@@ -38,9 +38,17 @@ class Inventory
      */
     protected $inventoryParts;
 
+    /**
+     * @var Collection
+     *
+     * @ORM\OneToMany(targetEntity="AppBundle\Entity\Rebrickable\Inventory_Set", mappedBy="inventory")
+     */
+    protected $inventorySets;
+
     public function __construct()
     {
         $this->inventoryParts = new ArrayCollection();
+        $this->inventorySets = new ArrayCollection();
     }
 
     /**
@@ -90,4 +98,20 @@ class Inventory
     {
         $this->inventoryParts = $inventoryParts;
     }
+
+    /**
+     * @return Collection
+     */
+    public function getInventorySets()
+    {
+        return $this->inventorySets;
+    }
+
+    /**
+     * @param Collection $inventorySets
+     */
+    public function setInventorySets($inventorySets)
+    {
+        $this->inventorySets = $inventorySets;
+    }
 }
diff --git a/src/AppBundle/Entity/Rebrickable/Inventory_Part.php b/src/AppBundle/Entity/Rebrickable/Inventory_Part.php
index 47c3ac8..5029730 100644
--- a/src/AppBundle/Entity/Rebrickable/Inventory_Part.php
+++ b/src/AppBundle/Entity/Rebrickable/Inventory_Part.php
@@ -28,7 +28,7 @@ class Inventory_Part
 
     /**
      * @var bool
-     *
+     * @ORM\Id
      * @ORM\Column(type="boolean")
      */
     protected $spare;
diff --git a/src/AppBundle/Entity/Rebrickable/Inventory_Set.php b/src/AppBundle/Entity/Rebrickable/Inventory_Set.php
new file mode 100644
index 0000000..bb2e67f
--- /dev/null
+++ b/src/AppBundle/Entity/Rebrickable/Inventory_Set.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace AppBundle\Entity\Rebrickable;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Inventory_Set.
+ *
+ * @ORM\Table(name="rebrickable_inventory_sets")
+ * @ORM\Entity(repositoryClass="AppBundle\Repository\Rebrickable\Inventory_SetRepository")
+ */
+class Inventory_Set
+{
+    /**
+     * @var Inventory
+     * @ORM\Id
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Rebrickable\Inventory", inversedBy="inventorySets")
+     */
+    protected $inventory;
+
+    /**
+     * @var Set
+     * @ORM\Id
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Rebrickable\Set", inversedBy="inventorySets")
+     */
+    protected $set;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer")
+     */
+    protected $quantity;
+
+    /**
+     * Get count.
+     *
+     * @return int
+     */
+    public function getQuantity()
+    {
+        return $this->quantity;
+    }
+
+    /**
+     * @return Set
+     */
+    public function getSet()
+    {
+        return $this->set;
+    }
+
+    /**
+     * @param Set $set
+     */
+    public function setSet($set)
+    {
+        $this->set = $set;
+    }
+
+    /**
+     * @return Inventory
+     */
+    public function getInventory()
+    {
+        return $this->inventory;
+    }
+
+    /**
+     * @param Inventory $inventory
+     *
+     * @return Inventory_Set
+     */
+    public function setInventory(Inventory $inventory)
+    {
+        $this->inventory = $inventory;
+
+        return $this;
+    }
+}
diff --git a/src/AppBundle/Entity/Rebrickable/Set.php b/src/AppBundle/Entity/Rebrickable/Set.php
index f529534..7a56ff4 100644
--- a/src/AppBundle/Entity/Rebrickable/Set.php
+++ b/src/AppBundle/Entity/Rebrickable/Set.php
@@ -47,12 +47,20 @@ class Set
      */
     protected $theme;
 
+    /**
+     * @var Collection
+     *
+     * @ORM\OneToMany(targetEntity="AppBundle\Entity\Rebrickable\Inventory_Set", mappedBy="set")
+     */
+    protected $inventorySets;
+
     /**
      * Set constructor.
      */
     public function __construct()
     {
         $this->inventories = new ArrayCollection();
+        $this->inventorySets = new ArrayCollection();
     }
 
     /**
@@ -133,6 +141,22 @@ class Set
         return $this;
     }
 
+    /**
+     * @return Collection
+     */
+    public function getInventorySets()
+    {
+        return $this->inventorySets;
+    }
+
+    /**
+     * @param Collection $inventorySets
+     */
+    public function setInventorySets($inventorySets)
+    {
+        $this->inventorySets = $inventorySets;
+    }
+
     /**
      * @return Theme
      */
diff --git a/src/AppBundle/Entity/Traits/UniqueNameTrait.php b/src/AppBundle/Entity/Traits/UniqueNameTrait.php
new file mode 100644
index 0000000..63c742d
--- /dev/null
+++ b/src/AppBundle/Entity/Traits/UniqueNameTrait.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace AppBundle\Entity\Traits;
+
+trait UniqueNameTrait
+{
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=255, nullable=true, unique=true)
+     */
+    protected $name;
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return mixed
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+}
diff --git a/src/AppBundle/Exception/ConvertingFailedException.php b/src/AppBundle/Exception/ConvertingFailedException.php
new file mode 100644
index 0000000..5cf7426
--- /dev/null
+++ b/src/AppBundle/Exception/ConvertingFailedException.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace AppBundle\Exception;
+
+use Exception;
+
+class ConvertingFailedException extends \Exception
+{
+    private $filepath;
+
+    public function __construct($form = '', $to = '', $message = '', $code = 0, Exception $previous = null)
+    {
+        $message = sprintf('Error converting "%s" file to "%s".', $form, $to);
+
+        parent::__construct($message, $code, $previous);
+
+        $this->filepath = $form;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getFilepath()
+    {
+        return $this->filepath;
+    }
+
+    /**
+     * @param mixed $filepath
+     */
+    public function setFilepath($filepath)
+    {
+        $this->filepath = $filepath;
+    }
+}
diff --git a/src/AppBundle/Exception/ErrorParsingLineException.php b/src/AppBundle/Exception/ErrorParsingLineException.php
new file mode 100644
index 0000000..ac9005b
--- /dev/null
+++ b/src/AppBundle/Exception/ErrorParsingLineException.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace AppBundle\Exception;
+
+use Throwable;
+
+class ErrorParsingLineException extends FileException
+{
+    public function __construct($path, $line, $message = '', $code = 0, Throwable $previous = null)
+    {
+        $message = sprintf('Error parsing line \""%s"\" "%s" file.',$line, $path);
+
+        parent::__construct($path, $message, $code, $previous);
+    }
+}
diff --git a/src/AppBundle/Exception/FileException.php b/src/AppBundle/Exception/FileException.php
new file mode 100644
index 0000000..dd3d8b8
--- /dev/null
+++ b/src/AppBundle/Exception/FileException.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace AppBundle\Exception;
+
+use Throwable;
+
+class FileException extends \Exception
+{
+    protected $path;
+
+    public function __construct($path, $message = '', $code = 0, Throwable $previous = null)
+    {
+        $this->path = $path;
+
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/src/AppBundle/Exception/FileNotFoundException.php b/src/AppBundle/Exception/FileNotFoundException.php
new file mode 100644
index 0000000..6a278f4
--- /dev/null
+++ b/src/AppBundle/Exception/FileNotFoundException.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace AppBundle\Exception;
+
+use Throwable;
+
+class FileNotFoundException extends FileException
+{
+    public function __construct($path, $message = '', $code = 0, Throwable $previous = null)
+    {
+        $message = sprintf('File "%s" not found.', $path);
+
+        parent::__construct($path, $message, $code, $previous);
+    }
+}
diff --git a/src/AppBundle/Exception/ParseErrorException.php b/src/AppBundle/Exception/ParseErrorException.php
new file mode 100644
index 0000000..9552965
--- /dev/null
+++ b/src/AppBundle/Exception/ParseErrorException.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace AppBundle\Exception;
+
+use Throwable;
+
+class ParseErrorException extends FileException
+{
+    public function __construct($path, $message = '', $code = 0, Throwable $previous = null)
+    {
+        $message = sprintf('Error parsing "%s" file.', $path);
+
+        parent::__construct($path, $message, $code, $previous);
+    }
+}
diff --git a/src/AppBundle/Exception/WriteErrorException.php b/src/AppBundle/Exception/WriteErrorException.php
new file mode 100644
index 0000000..9346cd5
--- /dev/null
+++ b/src/AppBundle/Exception/WriteErrorException.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace AppBundle\Exception;
+
+use Throwable;
+
+class WriteErrorException extends FileException
+{
+    public function __construct($file, $message = '', $code = 0, Throwable $previous = null)
+    {
+        $message = sprintf('Could not write into "%s" file.', $file);
+
+        parent::__construct($file, $message, $code, $previous);
+    }
+}
diff --git a/src/AppBundle/Form/Filter/CategoryFilterType.php b/src/AppBundle/Form/Filter/Model/CategoryFilterType.php
similarity index 78%
rename from src/AppBundle/Form/Filter/CategoryFilterType.php
rename to src/AppBundle/Form/Filter/Model/CategoryFilterType.php
index 90f068f..82dd9ee 100644
--- a/src/AppBundle/Form/Filter/CategoryFilterType.php
+++ b/src/AppBundle/Form/Filter/Model/CategoryFilterType.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace AppBundle\Form\Filter;
+namespace AppBundle\Form\Filter\Model;
 
 use AppBundle\Entity\LDraw\Category;
-use AppBundle\Manager\LDraw\CategoryManager;
+use AppBundle\Repository\LDraw\CategoryRepository;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type as Filters;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -11,17 +11,17 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class CategoryFilterType extends AbstractType
 {
-    private $categoryManager;
+    private $categoryRepository;
 
-    public function __construct(CategoryManager $categoryManager)
+    public function __construct(CategoryRepository $categoryRepository)
     {
-        $this->categoryManager = $categoryManager;
+        $this->categoryRepository = $categoryRepository;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('id', Filters\ChoiceFilterType::class, [
-            'choices' => $this->categoryManager->findAll(),
+            'choices' => $this->categoryRepository->findAll(),
             'choice_label' => 'name',
             'label' => 'filter.part.category',
         ]);
diff --git a/src/AppBundle/Form/Filter/ModelFilterType.php b/src/AppBundle/Form/Filter/Model/ModelFilterType.php
similarity index 98%
rename from src/AppBundle/Form/Filter/ModelFilterType.php
rename to src/AppBundle/Form/Filter/Model/ModelFilterType.php
index a6bf2c7..e4dbe63 100644
--- a/src/AppBundle/Form/Filter/ModelFilterType.php
+++ b/src/AppBundle/Form/Filter/Model/ModelFilterType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AppBundle\Form\Filter;
+namespace AppBundle\Form\Filter\Model;
 
 use Doctrine\ORM\QueryBuilder;
 use Lexik\Bundle\FormFilterBundle\Filter\FilterBuilderExecuterInterface;
diff --git a/src/AppBundle/Form/Filter/Set/SetFilterType.php b/src/AppBundle/Form/Filter/Set/SetFilterType.php
new file mode 100644
index 0000000..6912968
--- /dev/null
+++ b/src/AppBundle/Form/Filter/Set/SetFilterType.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace AppBundle\Form\Filter\Set;
+
+use Doctrine\ORM\QueryBuilder;
+use Lexik\Bundle\FormFilterBundle\Filter\FilterBuilderExecuterInterface;
+use Lexik\Bundle\FormFilterBundle\Filter\Form\Type as Filters;
+use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class SetFilterType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('search', Filters\TextFilterType::class, [
+            'apply_filter' => [$this, 'setSearchCallback'],
+            'label' => 'filter.part.search',
+        ]);
+
+        $builder->add('theme', ThemeFilterType::class, [
+            'add_shared' => function (FilterBuilderExecuterInterface $builderExecuter) {
+                $builderExecuter->addOnce($builderExecuter->getAlias().'.theme', 'c', function (QueryBuilder $filterBuilder, $alias, $joinAlias, $expr) {
+                    $filterBuilder->leftJoin($alias.'.theme', $joinAlias);
+                });
+            },
+        ]);
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'model_filter';
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'csrf_protection' => false,
+            'validation_groups' => ['filtering'], // avoid NotBlank() constraint-related message
+        ]);
+    }
+
+    public function setSearchCallback(QueryInterface $filterQuery, $field, $values)
+    {
+        if (empty($values['value'])) {
+            return null;
+        }
+
+        // expression that represent the condition
+        $expression = $filterQuery->getExpr()->orX(
+            $filterQuery->getExpr()->like('s.name', ':value'),
+            $filterQuery->getExpr()->like('s.number', ':value')
+        );
+
+        return $filterQuery->createCondition($expression, ['value' => '%'.$values['value'].'%']);
+    }
+}
diff --git a/src/AppBundle/Form/Filter/Set/ThemeFilterType.php b/src/AppBundle/Form/Filter/Set/ThemeFilterType.php
new file mode 100644
index 0000000..f215fc4
--- /dev/null
+++ b/src/AppBundle/Form/Filter/Set/ThemeFilterType.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace AppBundle\Form\Filter\Set;
+
+use AppBundle\Entity\Rebrickable\Theme;
+use AppBundle\Repository\Rebrickable\ThemeRepository;
+use Lexik\Bundle\FormFilterBundle\Filter\Form\Type as Filters;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class ThemeFilterType extends AbstractType
+{
+    private $themeRepository;
+
+    public function __construct(ThemeRepository $themeRepository)
+    {
+        $this->themeRepository = $themeRepository;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('id', Filters\ChoiceFilterType::class, [
+            'choices' => $this->themeRepository->findAll(),
+            'choice_label' => function ($theme, $currentChoiceKey) {
+                if ($parent = $theme->getParent()) {
+                    if ($parentParent = $parent->getParent()) {
+                        if ($parentParentParent = $parentParent->getParent()) {
+                            return $parentParentParent->getName().' > '.$parentParent->getName().' > '.$parent->getName().' > '.$theme->getName();
+                        }
+
+                        return $parentParent->getName().' > '.$parent->getName().' > '.$theme->getName();
+                    }
+
+                    return $parent->getName().' > '.$theme->getName();
+                }
+
+                return $theme->getName();
+            },
+            'label' => 'filter.set.theme',
+        ]);
+    }
+
+    public function getParent()
+    {
+        return Filters\SharedableFilterType::class; // this allow us to use the "add_shared" option
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'theme_filter';
+    }
+
+    public function setDefaultOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => Theme::class,
+            'csrf_protection' => false,
+            'validation_groups' => ['filtering'], // avoid NotBlank() constraint-related message
+            'method' => 'GET',
+        ]);
+    }
+}
diff --git a/src/AppBundle/Manager/BaseManager.php b/src/AppBundle/Manager/BaseManager.php
deleted file mode 100644
index cfeb49c..0000000
--- a/src/AppBundle/Manager/BaseManager.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace AppBundle\Manager;
-
-class BaseManager
-{
-    protected $repository;
-
-    /**
-     * @return mixed
-     */
-    public function getRepository()
-    {
-        return $this->repository;
-    }
-}
diff --git a/src/AppBundle/Manager/LDraw/AliasManager.php b/src/AppBundle/Manager/LDraw/AliasManager.php
deleted file mode 100644
index fa50d6d..0000000
--- a/src/AppBundle/Manager/LDraw/AliasManager.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace AppBundle\Manager\LDraw;
-
-use AppBundle\Entity\LDraw\Alias;
-use AppBundle\Entity\LDraw\Model;
-use AppBundle\Manager\BaseManager;
-use AppBundle\Repository\LDraw\AliasRepository;
-
-class AliasManager extends BaseManager
-{
-    /**
-     * AliasManager constructor.
-     *
-     * @param AliasRepository $repository
-     */
-    public function __construct(AliasRepository $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    /**
-     * Create new Alias entity.
-     *
-     * @param $number
-     * @param Model $model
-     *
-     * @return Alias
-     */
-    public function create($number, $model)
-    {
-        if (($alias = $this->repository->findOneBy(['number' => $number, 'model' => $model])) == null) {
-            $alias = new Alias();
-            $alias->setModel($model);
-            $alias->setNumber($number);
-        }
-
-        return $alias;
-    }
-}
diff --git a/src/AppBundle/Manager/LDraw/CategoryManager.php b/src/AppBundle/Manager/LDraw/CategoryManager.php
deleted file mode 100644
index 7df6d71..0000000
--- a/src/AppBundle/Manager/LDraw/CategoryManager.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace AppBundle\Manager\LDraw;
-
-use AppBundle\Entity\LDraw\Category;
-use AppBundle\Manager\BaseManager;
-use AppBundle\Repository\LDraw\CategoryRepository;
-
-class CategoryManager extends BaseManager
-{
-    /**
-     * CategoryManager constructor.
-     *
-     * @param CategoryRepository $repository
-     */
-    public function __construct(CategoryRepository $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    public function findAll()
-    {
-        return $this->repository->findAll();
-    }
-
-    /**
-     * Create new Category entity with $name or retrieve one.
-     *
-     * @param $name
-     *
-     * @return Category
-     */
-    public function create($name)
-    {
-        if (($category = $this->repository->findByName($name)) == null) {
-            $category = new Category();
-            $category->setName($name);
-        }
-
-        return $category;
-    }
-}
diff --git a/src/AppBundle/Manager/LDraw/KeywordManager.php b/src/AppBundle/Manager/LDraw/KeywordManager.php
deleted file mode 100644
index a321708..0000000
--- a/src/AppBundle/Manager/LDraw/KeywordManager.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace AppBundle\Manager\LDraw;
-
-use AppBundle\Entity\LDraw\Keyword;
-use AppBundle\Manager\BaseManager;
-use AppBundle\Repository\LDraw\KeywordRepository;
-
-class KeywordManager extends BaseManager
-{
-    /**
-     * KeywordManager constructor.
-     *
-     * @param KeywordRepository $repository
-     */
-    public function __construct(KeywordRepository $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    /**
-     * Create new Keyword entity with $name or retrieve one.
-     *
-     * @param $name
-     *
-     * @return Keyword
-     */
-    public function create($name)
-    {
-        if (($keyword = $this->repository->findByName($name)) == null) {
-            $keyword = new Keyword();
-            $keyword->setName($name);
-        }
-
-        return $keyword;
-    }
-}
diff --git a/src/AppBundle/Manager/LDraw/ModelManager.php b/src/AppBundle/Manager/LDraw/ModelManager.php
deleted file mode 100644
index 3c3f8fd..0000000
--- a/src/AppBundle/Manager/LDraw/ModelManager.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace AppBundle\Manager\LDraw;
-
-use AppBundle\Entity\LDraw\Model;
-use AppBundle\Manager\BaseManager;
-use AppBundle\Repository\LDraw\ModelRepository;
-
-class ModelManager extends BaseManager
-{
-    /**
-     * ModelManager constructor.
-     *
-     * @param ModelRepository $repository
-     */
-    public function __construct(ModelRepository $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    /**
-     * Create new Model entity with $number or retrieve one.
-     *
-     * @param $number
-     *
-     * @return Model
-     */
-    public function create($number)
-    {
-        if (($model = $this->repository->findOneBy(['number' => $number])) == null) {
-            $model = new Model();
-            $model->setNumber($number);
-        }
-
-        return $model;
-    }
-
-    public function findByNumber($number)
-    {
-        return $this->repository->findOneByNumber($number);
-    }
-
-    public function findByName($name)
-    {
-        return $this->repository->findOneBy(['name' => $name]);
-    }
-}
diff --git a/src/AppBundle/Manager/LDraw/SubpartManager.php b/src/AppBundle/Manager/LDraw/SubpartManager.php
deleted file mode 100644
index 3b74da3..0000000
--- a/src/AppBundle/Manager/LDraw/SubpartManager.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace AppBundle\Manager\LDraw;
-
-use AppBundle\Entity\LDraw\Subpart;
-use AppBundle\Manager\BaseManager;
-use AppBundle\Repository\LDraw\SubpartRepository;
-
-class SubpartManager extends BaseManager
-{
-    /**
-     * SubpartManager constructor.
-     *
-     * @param SubpartRepository $repository
-     */
-    public function __construct(SubpartRepository $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    /**
-     * Create new Subpart relation entity or retrieve one by foreign keys.
-     *
-     * @param $name
-     *
-     * @return Subpart
-     */
-    public function create($parent, $child)
-    {
-        if (($subpart = $this->repository->findOneByKeys($parent, $child))) {
-            $subpart->setCount($subpart->getCount() + 1);
-        } else {
-            $subpart = new Subpart();
-            $subpart
-                ->setParent($parent)
-                ->setSubpart($child)
-                ->setCount(1);
-        }
-
-        return $subpart;
-    }
-}
diff --git a/src/AppBundle/Manager/LDraw/TypeManager.php b/src/AppBundle/Manager/LDraw/TypeManager.php
deleted file mode 100644
index e86e18f..0000000
--- a/src/AppBundle/Manager/LDraw/TypeManager.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace AppBundle\Manager\LDraw;
-
-use AppBundle\Entity\LDraw\Type;
-use AppBundle\Manager\BaseManager;
-use AppBundle\Repository\LDraw\TypeRepository;
-
-class TypeManager extends BaseManager
-{
-    /**
-     * TypeManager constructor.
-     *
-     * @param TypeRepository $typeRepository
-     */
-    public function __construct(TypeRepository $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    /**
-     * Create new Keyword entity with $name or retrieve one.
-     *
-     * @param $name
-     *
-     * @return Type
-     */
-    public function create($name)
-    {
-        if (($type = $this->repository->findByName($name)) == null) {
-            $type = new Type();
-            $type->setName($name);
-        }
-
-        return $type;
-    }
-}
diff --git a/src/AppBundle/Manager/LDrawManager.php b/src/AppBundle/Manager/LDrawManager.php
deleted file mode 100644
index e452f93..0000000
--- a/src/AppBundle/Manager/LDrawManager.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace AppBundle\Manager;
-
-use AppBundle\Manager\LDraw\AliasManager;
-use AppBundle\Manager\LDraw\CategoryManager;
-use AppBundle\Manager\LDraw\KeywordManager;
-use AppBundle\Manager\LDraw\ModelManager;
-use AppBundle\Manager\LDraw\SubpartManager;
-use AppBundle\Manager\LDraw\TypeManager;
-
-class LDrawManager
-{
-    /** @var CategoryManager */
-    private $categoryManager;
-
-    /** @var KeywordManager */
-    private $keywordManager;
-
-    /** @var TypeManager */
-    private $typeManager;
-
-    /** @var SubpartManager */
-    private $subpartManager;
-
-    /** @var ModelManager */
-    private $modelManager;
-
-    /** @var AliasManager */
-    private $aliasManager;
-
-    /**
-     * LDrawService constructor.
-     *
-     * @param CategoryManager $categoryManager
-     * @param KeywordManager  $keywordManager
-     * @param TypeManager     $typeManager
-     * @param SubpartManager  $subpartManager
-     * @param ModelManager    $modelManager
-     * @param AliasManager    $aliasManager
-     */
-    public function __construct(CategoryManager $categoryManager, KeywordManager $keywordManager, TypeManager $typeManager, SubpartManager $subpartManager, ModelManager $modelManager, AliasManager $aliasManager)
-    {
-        $this->categoryManager = $categoryManager;
-        $this->keywordManager = $keywordManager;
-        $this->typeManager = $typeManager;
-        $this->subpartManager = $subpartManager;
-        $this->modelManager = $modelManager;
-        $this->aliasManager = $aliasManager;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCategoryManager()
-    {
-        return $this->categoryManager;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getKeywordManager()
-    {
-        return $this->keywordManager;
-    }
-
-    /**
-     * @return TypeManager
-     */
-    public function getTypeManager()
-    {
-        return $this->typeManager;
-    }
-
-    /**
-     * @return SubpartManager
-     */
-    public function getSubpartManager()
-    {
-        return $this->subpartManager;
-    }
-
-    /**
-     * @return ModelManager
-     */
-    public function getModelManager()
-    {
-        return $this->modelManager;
-    }
-
-    /**
-     * @return AliasManager
-     */
-    public function getAliasManager()
-    {
-        return $this->aliasManager;
-    }
-}
diff --git a/src/AppBundle/Menu/Builder.php b/src/AppBundle/Menu/Builder.php
index d94fe81..acd48a9 100644
--- a/src/AppBundle/Menu/Builder.php
+++ b/src/AppBundle/Menu/Builder.php
@@ -35,7 +35,7 @@ class Builder
         ]);
 
         $menu->addChild('Models', [
-            'route' => 'ldraw_model_index',
+            'route' => 'model_index',
         ]);
 
         $menu->addChild('Sets', [
diff --git a/src/AppBundle/Repository/LDraw/AliasRepository.php b/src/AppBundle/Repository/LDraw/AliasRepository.php
index 18497f4..3af7989 100644
--- a/src/AppBundle/Repository/LDraw/AliasRepository.php
+++ b/src/AppBundle/Repository/LDraw/AliasRepository.php
@@ -2,8 +2,28 @@
 
 namespace AppBundle\Repository\LDraw;
 
+use AppBundle\Entity\LDraw\Alias;
+use AppBundle\Entity\LDraw\Model;
 use AppBundle\Repository\BaseRepository;
 
 class AliasRepository extends BaseRepository
 {
+    /**
+     * Get existing entity or create new.
+     *
+     * @param $number
+     * @param Model $model
+     *
+     * @return Alias
+     */
+    public function getOrCreate($number, $model)
+    {
+        if (($alias = $this->findOneBy(['number' => $number, 'model' => $model])) == null) {
+            $alias = new Alias();
+            $alias->setModel($model);
+            $alias->setNumber($number);
+        }
+
+        return $alias;
+    }
 }
diff --git a/src/AppBundle/Repository/LDraw/AuthorRepository.php b/src/AppBundle/Repository/LDraw/AuthorRepository.php
new file mode 100644
index 0000000..eca33fb
--- /dev/null
+++ b/src/AppBundle/Repository/LDraw/AuthorRepository.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace AppBundle\Repository\LDraw;
+
+use AppBundle\Entity\LDraw\Author;
+use AppBundle\Repository\BaseRepository;
+
+class AuthorRepository extends BaseRepository
+{
+    public function findOneByName($name)
+    {
+        return $this->findOneBy(['name' => $name]);
+    }
+
+    /**
+     * Get existing entity or create new.
+     *
+     * @param $name
+     *
+     * @return Author
+     */
+    public function getOrCreate($name)
+    {
+        if (($author = $this->findOneByName($name)) == null) {
+            $author = new Author();
+            $author->setName($name);
+        }
+
+        return $author;
+    }
+}
diff --git a/src/AppBundle/Repository/LDraw/CategoryRepository.php b/src/AppBundle/Repository/LDraw/CategoryRepository.php
index 4b0e43a..54e893e 100644
--- a/src/AppBundle/Repository/LDraw/CategoryRepository.php
+++ b/src/AppBundle/Repository/LDraw/CategoryRepository.php
@@ -2,6 +2,7 @@
 
 namespace AppBundle\Repository\LDraw;
 
+use AppBundle\Entity\LDraw\Category;
 use AppBundle\Repository\BaseRepository;
 
 class CategoryRepository extends BaseRepository
@@ -10,4 +11,21 @@ class CategoryRepository extends BaseRepository
     {
         return $this->findOneBy(['name' => $name]);
     }
+
+    /**
+     * Get existing entity or create new.
+     *
+     * @param $name
+     *
+     * @return Category
+     */
+    public function getOrCreate($name)
+    {
+        if (($category = $this->findByName($name)) == null) {
+            $category = new Category();
+            $category->setName($name);
+        }
+
+        return $category;
+    }
 }
diff --git a/src/AppBundle/Repository/LDraw/KeywordRepository.php b/src/AppBundle/Repository/LDraw/KeywordRepository.php
index 43e8a67..019b81a 100644
--- a/src/AppBundle/Repository/LDraw/KeywordRepository.php
+++ b/src/AppBundle/Repository/LDraw/KeywordRepository.php
@@ -2,6 +2,7 @@
 
 namespace AppBundle\Repository\LDraw;
 
+use AppBundle\Entity\LDraw\Keyword;
 use AppBundle\Repository\BaseRepository;
 
 class KeywordRepository extends BaseRepository
@@ -10,4 +11,21 @@ class KeywordRepository extends BaseRepository
     {
         return $this->findOneBy(['name' => $name]);
     }
+
+    /**
+     * Create new Keyword entity with $name or retrieve one.
+     *
+     * @param $name
+     *
+     * @return Keyword
+     */
+    public function getOrCreate($name)
+    {
+        if (($keyword = $this->findByName($name)) == null) {
+            $keyword = new Keyword();
+            $keyword->setName($name);
+        }
+
+        return $keyword;
+    }
 }
diff --git a/src/AppBundle/Repository/LDraw/ModelRepository.php b/src/AppBundle/Repository/LDraw/ModelRepository.php
index 0cd4e99..27f6c2a 100644
--- a/src/AppBundle/Repository/LDraw/ModelRepository.php
+++ b/src/AppBundle/Repository/LDraw/ModelRepository.php
@@ -2,30 +2,33 @@
 
 namespace AppBundle\Repository\LDraw;
 
-use AppBundle\Entity\Rebrickable\Set;
-use AppBundle\Entity\Rebrickable\Part;
 use AppBundle\Entity\LDraw\Alias;
-use AppBundle\Entity\LDraw\Type;
+use AppBundle\Entity\LDraw\Category;
+use AppBundle\Entity\LDraw\Model;
+use AppBundle\Entity\LDraw\Subpart;
 use AppBundle\Entity\Rebrickable\Inventory;
 use AppBundle\Entity\Rebrickable\Inventory_Part;
+use AppBundle\Entity\Rebrickable\Part;
+use AppBundle\Entity\Rebrickable\Set;
 use AppBundle\Repository\BaseRepository;
 use Doctrine\ORM\Query\Expr\Join;
 
 class ModelRepository extends BaseRepository
 {
-    public function findAllByType($type)
+    public function getFilteredQueryBuilder()
     {
         $queryBuilder = $this->createQueryBuilder('model')
-            ->join(Type::class, 'type', Join::LEFT_JOIN, 'model.type = :type')
-            ->setParameter('type', $type);
+//            ->where('model.name NOT LIKE :obsolete')
+//            ->setParameter('obsolete','~%')
+;
 
-        return $queryBuilder->getQuery();
+        return $queryBuilder;
     }
 
     public function findAllByCategory($category)
     {
         $queryBuilder = $this->createQueryBuilder('model')
-            ->join(Type::class, 'type', Join::LEFT_JOIN, 'model.category = :category')
+            ->join(Category::class, 'type', Join::LEFT_JOIN, 'model.category = :category')
             ->setParameter('category', $category);
 
         return $queryBuilder->getQuery();
@@ -49,6 +52,11 @@ class ModelRepository extends BaseRepository
         return $model;
     }
 
+    public function findOneByName($name)
+    {
+        return $this->findOneBy(['name' => $name]);
+    }
+
     public function findAllBySetNumber($number)
     {
         $queryBuilder = $this->createQueryBuilder('model');
@@ -64,4 +72,38 @@ class ModelRepository extends BaseRepository
 
         return $queryBuilder->getQuery()->getResult();
     }
+
+    public function findAllRelatedModels($number)
+    {
+        $queryBuilder = $this->createQueryBuilder('model');
+
+        $queryBuilder
+            ->select('related')
+            ->join(Subpart::class, 'subpart', JOIN::WITH, 'model.number = subpart.subpart')
+            ->join(Subpart::class, 'parent', JOIN::WITH, 'subpart.parent = parent.parent')
+            ->join(Model::class, 'related', JOIN::WITH, 'related.number = parent.subpart')
+            ->where('model.number = :number')
+            ->setParameter('number', $number)
+            ->andWhere('related.number != :number')
+            ->distinct(true);
+
+        return $queryBuilder->getQuery()->getResult();
+    }
+
+    /**
+     * Create new Model entity with $number or retrieve one.
+     *
+     * @param $number
+     *
+     * @return Model
+     */
+    public function getOrCreate($number)
+    {
+        if (($model = $this->findOneBy(['number' => $number])) == null) {
+            $model = new Model();
+            $model->setNumber($number);
+        }
+
+        return $model;
+    }
 }
diff --git a/src/AppBundle/Repository/LDraw/PartRepository.php b/src/AppBundle/Repository/LDraw/PartRepository.php
deleted file mode 100644
index 8f736c0..0000000
--- a/src/AppBundle/Repository/LDraw/PartRepository.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace AppBundle\Repository\LDraw;
-
-use AppBundle\Repository\BaseRepository;
-
-class PartRepository extends BaseRepository
-{
-}
diff --git a/src/AppBundle/Repository/LDraw/SubpartRepository.php b/src/AppBundle/Repository/LDraw/SubpartRepository.php
index 3674f50..25fa871 100644
--- a/src/AppBundle/Repository/LDraw/SubpartRepository.php
+++ b/src/AppBundle/Repository/LDraw/SubpartRepository.php
@@ -2,6 +2,7 @@
 
 namespace AppBundle\Repository\LDraw;
 
+use AppBundle\Entity\LDraw\Subpart;
 use AppBundle\Repository\BaseRepository;
 
 class SubpartRepository extends BaseRepository
@@ -10,4 +11,26 @@ class SubpartRepository extends BaseRepository
     {
         return $this->find(['parent' => $parent, 'subpart' => $child]);
     }
+
+    /**
+     * Create new Subpart relation entity or retrieve one by foreign keys.
+     *
+     * @param $name
+     *
+     * @return Subpart
+     */
+    public function getOrCreate($parent, $child, $count)
+    {
+        if (($subpart = $this->findOneByKeys($parent, $child))) {
+            $subpart->setCount($count);
+        } else {
+            $subpart = new Subpart();
+            $subpart
+                ->setParent($parent)
+                ->setSubpart($child)
+                ->setCount($count);
+        }
+
+        return $subpart;
+    }
 }
diff --git a/src/AppBundle/Repository/LDraw/TypeRepository.php b/src/AppBundle/Repository/LDraw/TypeRepository.php
deleted file mode 100644
index a4acdba..0000000
--- a/src/AppBundle/Repository/LDraw/TypeRepository.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace AppBundle\Repository\LDraw;
-
-use AppBundle\Repository\BaseRepository;
-
-class TypeRepository extends BaseRepository
-{
-    public function findByName($name)
-    {
-        return $this->findOneBy(['name' => $name]);
-    }
-}
diff --git a/src/AppBundle/Repository/Rebrickable/InventoryRepository.php b/src/AppBundle/Repository/Rebrickable/InventoryRepository.php
index 6776c3b..e542f17 100644
--- a/src/AppBundle/Repository/Rebrickable/InventoryRepository.php
+++ b/src/AppBundle/Repository/Rebrickable/InventoryRepository.php
@@ -2,8 +2,19 @@
 
 namespace AppBundle\Repository\Rebrickable;
 
+use AppBundle\Entity\Rebrickable\Set;
 use AppBundle\Repository\BaseRepository;
 
 class InventoryRepository extends BaseRepository
 {
+    public function findNewestInventoryBySetNumber($number)
+    {
+        $queryBuilder = $this->createQueryBuilder('inventory')
+            ->where('inventory.set = :setNumber')
+            ->setParameter('setNumber', $number)
+            ->orderBy('inventory.version', 'DESC')
+            ->setMaxResults(1);
+
+        return $queryBuilder->getQuery()->getOneOrNullResult();
+    }
 }
diff --git a/src/AppBundle/Repository/Rebrickable/Inventory_PartRepository.php b/src/AppBundle/Repository/Rebrickable/Inventory_PartRepository.php
index 537a19e..ef63d02 100644
--- a/src/AppBundle/Repository/Rebrickable/Inventory_PartRepository.php
+++ b/src/AppBundle/Repository/Rebrickable/Inventory_PartRepository.php
@@ -2,23 +2,42 @@
 
 namespace AppBundle\Repository\Rebrickable;
 
+use AppBundle\Entity\LDraw\Category;
 use AppBundle\Entity\Rebrickable\Inventory;
 use AppBundle\Entity\Rebrickable\Inventory_Part;
-use AppBundle\Entity\Rebrickable\Set;
+use AppBundle\Entity\Rebrickable\Part;
 use AppBundle\Repository\BaseRepository;
 use Doctrine\ORM\Query\Expr\Join;
 
 class Inventory_PartRepository extends BaseRepository
 {
-    public function findAllBySetNumber($number)
+    public function findAllRegularBySetNumber($number)
     {
-        $queryBuilder = $this->createQueryBuilder('inventory_part');
+        $inventory = $this->getEntityManager()->getRepository(Inventory::class)->findNewestInventoryBySetNumber($number);
 
-        $queryBuilder
-            ->join(Inventory::class, 'inventory', JOIN::WITH, 'inventory_part.inventory = inventory.id')
-            ->join(Set::class, 's', Join::WITH, 'inventory.set = s.number')
-            ->where('s.number LIKE :number')
-            ->setParameter('number', $number)
+        $queryBuilder = $this->createQueryBuilder('inventory_part')
+            ->join(Inventory::class, 'inventory', JOIN::WITH, 'inventory_part.inventory = inventory')
+            ->join(Part::class, 'part', JOIN::WITH, 'inventory_part.part = part.number')
+            ->where('part.category != 17')
+            ->andWhere('inventory.id = :inventoryId')
+            ->setParameter('inventoryId', $inventory->getId())
+            ->andWhere('inventory_part.spare = FALSE')
+            ->distinct(true);
+
+        return $queryBuilder->getQuery()->getResult();
+    }
+
+    public function findAllSpareBySetNumber($number)
+    {
+        $inventory = $this->getEntityManager()->getRepository(Inventory::class)->findNewestInventoryBySetNumber($number);
+
+        $queryBuilder = $this->createQueryBuilder('inventory_part')
+            ->join(Inventory::class, 'inventory', JOIN::WITH, 'inventory_part.inventory = inventory')
+            ->join(Part::class, 'part', JOIN::WITH, 'inventory_part.part = part.number')
+            ->where('part.category != 17')
+            ->andWhere('inventory.id = :inventoryId')
+            ->setParameter('inventoryId', $inventory->getId())
+            ->andWhere('inventory_part.spare = TRUE')
             ->distinct(true);
 
         return $queryBuilder->getQuery()->getResult();
diff --git a/src/AppBundle/Repository/Rebrickable/Inventory_SetRepository.php b/src/AppBundle/Repository/Rebrickable/Inventory_SetRepository.php
new file mode 100644
index 0000000..808d706
--- /dev/null
+++ b/src/AppBundle/Repository/Rebrickable/Inventory_SetRepository.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace AppBundle\Repository\Rebrickable;
+
+use AppBundle\Entity\Rebrickable\Inventory;
+use AppBundle\Repository\BaseRepository;
+
+class Inventory_SetRepository extends BaseRepository
+{
+    public function findAllBySetNumber($number)
+    {
+        $inventory = $this->getEntityManager()->getRepository(Inventory::class)->findNewestInventoryBySetNumber($number);
+
+        if ($inventory) {
+            $queryBuilder = $this->createQueryBuilder('inventory_set')
+                ->where('inventory_set.inventory = :inventory')
+                ->setParameter('inventory', $inventory->getId());
+
+            return $queryBuilder->getQuery()->getResult();
+        }
+
+        return null;
+    }
+}
diff --git a/src/AppBundle/Repository/Rebrickable/SetRepository.php b/src/AppBundle/Repository/Rebrickable/SetRepository.php
index 2237e9c..ce6b591 100644
--- a/src/AppBundle/Repository/Rebrickable/SetRepository.php
+++ b/src/AppBundle/Repository/Rebrickable/SetRepository.php
@@ -6,16 +6,28 @@ use AppBundle\Entity\LDraw\Model;
 use AppBundle\Entity\Rebrickable\Inventory;
 use AppBundle\Entity\Rebrickable\Inventory_Part;
 use AppBundle\Entity\Rebrickable\Part;
+use AppBundle\Entity\Rebrickable\Set;
+use AppBundle\Entity\Rebrickable\Theme;
 use AppBundle\Repository\BaseRepository;
 use Doctrine\ORM\Query\Expr\Join;
 
 class SetRepository extends BaseRepository
 {
+    public function findAllByTheme(Theme $theme)
+    {
+        dump($this->getEntityManager()->getRepository(Theme::class)->findAllSubthemes($theme));
+
+        $queryBuilder = $this->createQueryBuilder('s')
+            ->join(Theme::class, 'theme', Join::WITH, 's.theme = theme')
+            ->where('theme.id = :id')
+            ->setParameter('id', $theme->getId());
+
+        return $queryBuilder->getQuery()->getResult();
+    }
+
     public function findAllByPartNumber($number)
     {
-        $queryBuilder = $this->createQueryBuilder('s');
-
-        $queryBuilder
+        $queryBuilder = $this->createQueryBuilder('s')
             ->join(Inventory::class, 'inventory', JOIN::WITH, 'inventory.set = s.number')
             ->join(Inventory_Part::class, 'inventory_part', JOIN::WITH, 'inventory.id = inventory_part.inventory')
             ->join(Part::class, 'part', Join::WITH, 'inventory_part.part = part.number')
@@ -28,9 +40,7 @@ class SetRepository extends BaseRepository
 
     public function findAllByModel(Model $model)
     {
-        $queryBuilder = $this->createQueryBuilder('s');
-
-        $queryBuilder
+        $queryBuilder = $this->createQueryBuilder('s')
             ->join(Inventory::class, 'inventory', JOIN::WITH, 'inventory.set = s.number')
             ->join(Inventory_Part::class, 'inventory_part', JOIN::WITH, 'inventory.id = inventory_part.inventory')
             ->join(Part::class, 'part', Join::WITH, 'inventory_part.part = part.number')
diff --git a/src/AppBundle/Repository/Rebrickable/ThemeRepository.php b/src/AppBundle/Repository/Rebrickable/ThemeRepository.php
index 11b0d88..fcdaccd 100644
--- a/src/AppBundle/Repository/Rebrickable/ThemeRepository.php
+++ b/src/AppBundle/Repository/Rebrickable/ThemeRepository.php
@@ -2,8 +2,21 @@
 
 namespace AppBundle\Repository\Rebrickable;
 
+use AppBundle\Entity\Rebrickable\Theme;
 use AppBundle\Repository\BaseRepository;
+use Doctrine\ORM\Query\Expr\Join;
 
 class ThemeRepository extends BaseRepository
 {
+    public function findAllSubthemes(Theme $theme)
+    {
+        $subQueryBuilder = $this->createQueryBuilder('subtheme');
+
+        $queryBuilder = $this->createQueryBuilder('subtheme')
+            ->leftJoin(Theme::class, 'theme', Join::WITH, 'subtheme.parent = theme.id')
+            ->where('subtheme.parent = :id')
+            ->setParameter('id', $theme->getId());
+
+        return $queryBuilder->getQuery()->getResult();
+    }
 }
diff --git a/src/AppBundle/Service/LDViewService.php b/src/AppBundle/Service/LDViewService.php
index 1501f70..3b9d4b9 100644
--- a/src/AppBundle/Service/LDViewService.php
+++ b/src/AppBundle/Service/LDViewService.php
@@ -2,9 +2,10 @@
 
 namespace AppBundle\Service;
 
+use AppBundle\Exception\ConvertingFailedException;
 use League\Flysystem\File;
 use League\Flysystem\Filesystem;
-use Symfony\Component\Asset\Exception\LogicException;
+use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\ProcessBuilder;
 
 //TODO enable file overwrite
@@ -23,7 +24,7 @@ class LDViewService
     /**
      * @var Filesystem
      */
-    private $ldrawFilesystem;
+    private $ldrawLibraryContext;
 
     /**
      * LDViewService constructor.
@@ -38,81 +39,98 @@ class LDViewService
     }
 
     /**
-     * @param Filesystem $ldrawFilesystem
+     * @param string $ldrawLibraryContext
      */
-    public function setLdrawFilesystem($ldrawFilesystem)
+    public function setLDrawLibraryContext($ldrawLibraryContext)
     {
-        $this->ldrawFilesystem = $ldrawFilesystem;
+        $this->ldrawLibraryContext = $ldrawLibraryContext;
     }
 
     /**
      * Convert LDraw model from .dat format to .stl by using LDView
      * stores created file to $stlStorage filesystem.
      *
-     * @param Filesystem $LDrawDir
+     * @param $file
+     *
+     * @throws ConvertingFailedException
      *
      * @return File
      */
-    public function datToStl($file, $LDrawDir = null)
+    public function datToStl($file, $rewrite = false)
     {
         if (!$this->mediaFilesystem->has('ldraw'.DIRECTORY_SEPARATOR.'models')) {
             $this->mediaFilesystem->createDir('ldraw'.DIRECTORY_SEPARATOR.'models');
         }
 
-        $newFile = 'ldraw'.DIRECTORY_SEPARATOR.'models'.DIRECTORY_SEPARATOR.$file['filename'].'.stl';
+        $newFile = 'ldraw'.DIRECTORY_SEPARATOR.'models'.DIRECTORY_SEPARATOR.basename($file, '.dat').'.stl';
 
-        if (!$this->mediaFilesystem->has($newFile)) {
+        if (!$this->mediaFilesystem->has($newFile) || $rewrite) {
             $this->runLDView([
-                $this->ldrawFilesystem->getAdapter()->getPathPrefix().$file['path'],
-                '-LDrawDir='.$this->ldrawFilesystem->getAdapter()->getPathPrefix(),
+                $file,
+                '-LDrawDir='.$this->ldrawLibraryContext->getAdapter()->getPathPrefix(),
                 '-ExportFiles=1',
                 '-ExportSuffix=.stl',
                 '-ExportsDir='.$this->mediaFilesystem->getAdapter()->getPathPrefix().'ldraw'.DIRECTORY_SEPARATOR.'models',
             ]);
 
             // Check if file created successfully
-            if (!$this->mediaFilesystem->has($newFile)) {
-                throw new LogicException($newFile.': new file not found'); //TODO
+            if ($this->mediaFilesystem->has($newFile)) {
+                return $this->mediaFilesystem->get($newFile);
             }
+        } else {
+            return $this->mediaFilesystem->get($newFile);
         }
 
-        return $this->mediaFilesystem->get($newFile);
+        throw new ConvertingFailedException($file, 'STL');
     }
 
     /**
      * Convert LDraw model from .dat format to .stl by using LDView
      * stores created file to $stlStorage filesystem.
      *
-     * @param Filesystem $LDrawDir
+     * @param $file
+     *
+     * @throws ConvertingFailedException
      *
      * @return File
      */
-    public function datToPng($file, $LDrawDir = null)
+    public function datToPng($file, $rewrite = false)
     {
         if (!$this->mediaFilesystem->has('ldraw'.DIRECTORY_SEPARATOR.'images')) {
             $this->mediaFilesystem->createDir('ldraw'.DIRECTORY_SEPARATOR.'images');
         }
 
-        $newFile = 'ldraw'.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.$file['filename'].'.png';
+        $newFile = 'ldraw'.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.basename($file, '.dat').'.png';
 
-        if (!$this->mediaFilesystem->has($newFile)) {
+        if (!$this->mediaFilesystem->has($newFile) || $this->rewrite) {
             $this->runLDView([
-                $this->ldrawFilesystem->getAdapter()->getPathPrefix().$file['path'],
-                '-LDrawDir='.$this->ldrawFilesystem->getAdapter()->getPathPrefix(),
-                '-AutoCrop=1',
+                $file,
+                '-LDrawDir='.$this->ldrawLibraryContext->getAdapter()->getPathPrefix(),
+                '-AutoCrop=0',
                 '-SaveAlpha=0',
+                '-BackgroundColor3=0xFFFFFF',
+                '-DefaultColor3=0x136FC3',
                 '-SnapshotSuffix=.png',
+                '-HiResPrimitives=1',
+                '-UseQualityStuds=1',
+                '-UseQualityLighting=1',
+                '-SaveHeight=600',
+                '-SaveWidth=800',
+                '-CurveQuality=12',
+                '-DefaultLatLong=45,40',
                 '-SaveDir='.$this->mediaFilesystem->getAdapter()->getPathPrefix().'ldraw'.DIRECTORY_SEPARATOR.'images',
                 '-SaveSnapshots=1',
             ]);
 
             // Check if file created successfully
-            if (!$this->mediaFilesystem->has($newFile)) {
-                throw new LogicException($newFile.': new file not found'); //TODO
+            if ($this->mediaFilesystem->has($newFile)) {
+                return $this->mediaFilesystem->get($newFile);
             }
+        } else {
+            return $this->mediaFilesystem->get($newFile);
         }
 
-        return $this->mediaFilesystem->get($newFile);
+        throw new ConvertingFailedException($file, 'PNG');
     }
 
     /**
@@ -131,7 +149,7 @@ class LDViewService
         $process->run();
 
         if (!$process->isSuccessful()) {
-            throw new LogicException($process->getOutput()); //TODO
+            throw new ProcessFailedException($process); //TODO
         }
     }
 }
diff --git a/src/AppBundle/Service/Loader/BaseLoaderService.php b/src/AppBundle/Service/Loader/BaseLoader.php
similarity index 62%
rename from src/AppBundle/Service/Loader/BaseLoaderService.php
rename to src/AppBundle/Service/Loader/BaseLoader.php
index 0143da9..07343ee 100644
--- a/src/AppBundle/Service/Loader/BaseLoaderService.php
+++ b/src/AppBundle/Service/Loader/BaseLoader.php
@@ -2,15 +2,17 @@
 
 namespace AppBundle\Service\Loader;
 
-use AppBundle\Utils\RelationMapper;
+use AppBundle\Exception\FileNotFoundException;
+use AppBundle\Exception\WriteErrorException;
 use Doctrine\ORM\EntityManager;
+use Monolog\Logger;
 use Symfony\Bundle\FrameworkBundle\Translation\Translator;
 use Symfony\Component\Asset\Exception\LogicException;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Debug\Exception\ContextErrorException;
 
-abstract class BaseLoaderService
+abstract class BaseLoader
 {
     /**
      * @var EntityManager
@@ -27,8 +29,8 @@ abstract class BaseLoaderService
      */
     protected $progressBar;
 
-    /** @var RelationMapper */
-    protected $relationMapper;
+    /** @var Logger */
+    protected $logger;
 
     /**
      * Loader constructor.
@@ -36,11 +38,12 @@ abstract class BaseLoaderService
      * @param EntityManager $em
      * @param Translator    $translator
      */
-    public function setArguments(EntityManager $em, $relationMapper)
+    public function setArguments(EntityManager $em, $logger)
     {
         $this->em = $em;
-        $this->relationMapper = $relationMapper;
         $this->em->getConnection()->getConfiguration()->setSQLLogger(null);
+
+        $this->logger = $logger;
     }
 
     public function setOutput(OutputInterface $output)
@@ -49,11 +52,17 @@ abstract class BaseLoaderService
         $this->output->setDecorated(true);
     }
 
+    /**
+     * Initialize new progress bar.
+     *
+     * @param $total
+     */
     protected function initProgressBar($total)
     {
         $this->progressBar = new ProgressBar($this->output, $total);
-        $this->progressBar->setFormat('very_verbose');
-        $this->progressBar->setFormat('%current%/%max% [%bar%]%percent:3s%% (%elapsed:6s%/%estimated:-6s%)'.PHP_EOL);
+//        $this->progressBar->setFormat('very_verbose');
+        $this->progressBar->setFormat('[%current%/%max%] [%bar%] %percent:3s%% (%elapsed:6s%/%estimated:-6s%) (%filename%)'.PHP_EOL);
+        $this->progressBar->setBarWidth(70);
         $this->progressBar->start();
     }
 
@@ -62,20 +71,31 @@ abstract class BaseLoaderService
         switch ($notification_code) {
             case STREAM_NOTIFY_FILE_SIZE_IS:
                 $this->initProgressBar($bytes_max);
+                $this->progressBar->setFormat('[%current%/%max%] [%bar%] %percent:3s%% (%elapsed:6s%/%estimated:-6s%)'.PHP_EOL);
                 break;
             case STREAM_NOTIFY_PROGRESS:
                 $this->progressBar->setProgress($bytes_transferred);
                 break;
             case STREAM_NOTIFY_COMPLETED:
-                $this->progressBar->setProgress($bytes_transferred);
+                $this->progressBar->setMessage('<info>Done</info>');
+                $this->progressBar->setProgress($bytes_max);
                 $this->progressBar->finish();
                 break;
         }
     }
 
+    /**
+     * Download file from $url, save it to system temp directory and return filepath.
+     *
+     * @param $url
+     *
+     * @throws FileNotFoundException
+     *
+     * @return bool|string
+     */
     protected function downloadFile($url)
     {
-        $this->output->writeln('Downloading file from: <info>'.$url.'</info>');
+        $this->output->writeln('Loading file from: <comment>'.$url.'</comment>');
         $temp = tempnam(sys_get_temp_dir(), 'printabrick.');
 
         $ctx = stream_context_create([], [
@@ -84,12 +104,12 @@ abstract class BaseLoaderService
 
         try {
             if (false === file_put_contents($temp, fopen($url, 'r', 0, $ctx))) {
-                throw new LogicException('error writing file'); //TODO
+                throw new WriteErrorException($temp);
             }
         } catch (ContextErrorException $e) {
-            throw new LogicException('wrong url'); //TODO
+            throw new FileNotFoundException($url);
         } catch (\Exception $e) {
-            throw new LogicException('exception:  '.$e->getMessage()); //TODO
+            throw new LogicException($e);
         }
 
         return $temp;
diff --git a/src/AppBundle/Service/Loader/LDrawLoaderService.php b/src/AppBundle/Service/Loader/LDrawLoaderService.php
deleted file mode 100644
index 402274f..0000000
--- a/src/AppBundle/Service/Loader/LDrawLoaderService.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-
-namespace AppBundle\Service\Loader;
-
-use AppBundle\Entity\LDraw\Category;
-use AppBundle\Entity\LDraw\Model;
-use AppBundle\Entity\LDraw\Type;
-use AppBundle\Manager\LDrawManager;
-use AppBundle\Service\LDrawService;
-use AppBundle\Service\LDViewService;
-use AppBundle\Utils\DatParser;
-use League\Flysystem\Adapter\Local;
-use League\Flysystem\File;
-use League\Flysystem\Filesystem;
-//use Symfony\Component\Asset\Exception\LogicException;
-use Symfony\Component\Asset\Exception\LogicException;
-use Symfony\Component\Console\Helper\ProgressBar;
-
-//TODO refactor
-class LDrawLoaderService extends BaseLoaderService
-{
-    /**
-     * @var Filesystem
-     */
-    private $ldraw;
-
-    /**
-     * @var string download URL with current LDraw library
-     */
-    private $ldraw_url;
-
-    /**
-     * @var LDViewService
-     */
-    private $LDViewService;
-
-    /** @var LDrawManager */
-    private $ldrawService;
-
-    /** @var DatParser */
-    private $datParser;
-
-    /**
-     * @param array $ldraw_url
-     */
-    public function __construct(LDViewService $LDViewService, $ldraw_url, LDrawManager $ldrawService, $datParser)
-    {
-        $this->LDViewService = $LDViewService;
-        $this->ldraw_url = $ldraw_url;
-        $this->ldrawService = $ldrawService;
-        $this->datParser = $datParser;
-    }
-
-    /**
-     * Download current LDraw library and extract it to system tmp directory.
-     *
-     * @return string Absolute path to temporary Ldraw library
-     */
-    public function downloadLibrary()
-    {
-        $temp = $this->downloadFile($this->ldraw_url);
-
-        // Create unique temporary directory
-        $temp_dir = tempnam(sys_get_temp_dir(), 'printabrick.');
-        mkdir($temp_dir);
-
-        // Unzip downloaded library zip file to temporary directory
-        $zip = new \ZipArchive();
-        if ($zip->open($temp) != 'true') {
-            throw new LogicException('Error :- Unable to open the Zip File');
-        }
-        $zip->extractTo($temp_dir);
-        $zip->close();
-
-        // Unlink downloaded zip file
-        unlink($temp);
-
-        return $temp_dir;
-    }
-
-    /**
-     * @param $LDrawLibrary
-     */
-    public function loadData($LDrawLibrary)
-    {
-        $adapter = new Local($LDrawLibrary);
-        $this->ldraw = new Filesystem($adapter);
-
-        $this->LDViewService->setLdrawFilesystem($this->ldraw);
-
-        $this->loadParts();
-    }
-
-    // TODO refactor
-
-    public function loadParts()
-    {
-        $files = $this->ldraw->get('parts')->getContents();
-
-        $this->initProgressBar(count($files));
-
-        foreach ($files as $file) {
-            if ($file['type'] == 'file' && $file['extension'] == 'dat') {
-                $this->loadModel($file);
-            }
-
-            $this->progressBar->advance();
-        }
-        $this->progressBar->finish();
-    }
-
-    /**
-     * Load Model entity into database.
-     *
-     * @param $file
-     *
-     * @return Model|null
-     */
-    private function loadModel($file)
-    {
-        $modelManager = $this->ldrawService->getModelManager();
-        $subpartManager = $this->ldrawService->getSubpartManager();
-        $aliasManager = $this->ldrawService->getAliasManager();
-
-        $header = $this->datParser->parse($this->ldraw->get($file['path']));
-
-        if ($this->isModelIncluded($header)) {
-            if (isset($header['parent']) && ($parent = $this->getModelParent($header['parent'])) && ($parentFile = $this->getModelFile($parent))) {
-                $parentHeader = $this->datParser->parse($parentFile);
-
-                if ($this->isModelIncluded($parentHeader)) {
-                    $model = $modelManager->create($parentHeader['id']);
-                    $alias = $aliasManager->create($header['id'], $model);
-                    $aliasManager->getRepository()->save($alias);
-
-                    return $model;
-                }
-            } else {
-                $model = $modelManager->create($header['id']);
-                $model->setName($header['name']);
-                $model
-                    ->setCategory($this->ldrawService->getCategoryManager()->create($header['category']))
-                    ->setType($this->ldrawService->getTypeManager()->create($header['type']));
-
-                if (isset($header['keywords'])) {
-                    foreach ($header['keywords'] as $keyword) {
-                        $keyword = stripslashes(strtolower(trim($keyword)));
-                        $model->addKeyword($this->ldrawService->getKeywordManager()->create($keyword));
-                    }
-                }
-
-                if (isset($header['subparts'])) {
-                    $model->setType($this->ldrawService->getTypeManager()->create('Shortcut'));
-
-                    foreach ($header['subparts'] as $subpart) {
-                        $subpart = $this->getModelParent($subpart);
-
-                        if ($subpartFile = $this->getModelFile($subpart)) {
-                            $subpartHeader = $this->datParser->parse($subpartFile);
-
-                            if ($this->isModelIncluded($subpartHeader)) {
-                                $subpartModel = $modelManager->create($subpartHeader['id']);
-
-                                $subpart = $subpartManager->create($model, $subpartModel);
-                                $subpartManager->getRepository()->save($subpart);
-                            }
-                        }
-                    }
-                }
-
-                $model->setAuthor($header['author']);
-                $model->setModified($header['modified']);
-                $model->setPath($this->loadStlModel($file));
-
-                $modelManager->getRepository()->save($model);
-
-                return $model;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Find model file on ldraw filesystem.
-     *
-     * @param $id
-     *
-     * @return \League\Flysystem\Directory|File|\League\Flysystem\Handler|null
-     */
-    private function getModelFile($id)
-    {
-        $path = 'parts/'.strtolower($id).'.dat';
-        if ($this->ldraw->has($path)) {
-            return $this->ldraw->get($path);
-        }
-
-        return null;
-    }
-
-    /**
-     * Recursively load model parent id of model with $number id.
-     *
-     * @param string $number
-     *
-     * @return string
-     */
-    private function getModelParent($number)
-    {
-        if (($file = $this->getModelFile($number)) == null) {
-            return $number;
-        }
-
-        $header = $this->datParser->parse($file);
-
-        do {
-            $parent = isset($header['parent']) ? $header['parent'] : null;
-
-            if ($file = $this->getModelFile($parent)) {
-                $header = $this->datParser->parse($file);
-            } else {
-                break;
-            }
-        } while ($parent);
-
-        return $header['id'];
-    }
-
-    /**
-     * Determine if model file should be loaded into database.
-     *
-     * @param $header
-     *
-     * @return bool
-     */
-    private function isModelIncluded($header)
-    {
-        // Do not include sticker parts and incomplete parts
-        if (
-            strpos($header['id'], 's') !== 0
-            && $header['type'] != 'Subpart'
-            && $header['type'] != 'Sticker'
-            && !(($header['type'] == 'Printed') && $this->getModelFile($header['parent']))
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Load stl model by calling LDViewSevice and create new Model.
-     *
-     * @param $file
-     *
-     * @throws \Exception
-     *
-     * @return string path of stl file
-     */
-    private function loadStlModel($file)
-    {
-        try {
-            return $this->LDViewService->datToStl($file, $this->ldraw)->getPath();
-        } catch (\Exception $e) {
-            throw $e; //TODO
-        }
-    }
-}
diff --git a/src/AppBundle/Service/Loader/ModelLoader.php b/src/AppBundle/Service/Loader/ModelLoader.php
new file mode 100644
index 0000000..6e47507
--- /dev/null
+++ b/src/AppBundle/Service/Loader/ModelLoader.php
@@ -0,0 +1,331 @@
+<?php
+
+namespace AppBundle\Service\Loader;
+
+use AppBundle\Entity\LDraw\Alias;
+use AppBundle\Entity\LDraw\Author;
+use AppBundle\Entity\LDraw\Category;
+use AppBundle\Entity\LDraw\Keyword;
+use AppBundle\Entity\LDraw\Model;
+use AppBundle\Entity\LDraw\Subpart;
+use AppBundle\Exception\ConvertingFailedException;
+use AppBundle\Exception\FileException;
+use AppBundle\Exception\ParseErrorException;
+use AppBundle\Service\LDViewService;
+use AppBundle\Utils\LDModelParser;
+use AppBundle\Utils\RelationMapper;
+use League\Flysystem\Adapter\Local;
+use League\Flysystem\Exception;
+use League\Flysystem\Filesystem;
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\SplFileInfo;
+
+//TODO refactor
+class ModelLoader extends BaseLoader
+{
+    /**
+     * @var Filesystem
+     */
+    private $ldrawLibraryContext;
+
+    /**
+     * @var LDViewService
+     */
+    private $LDViewService;
+
+    /** @var LDModelParser */
+    private $ldModelParser;
+
+    /** @var RelationMapper */
+    private $relationMapper;
+
+    /** @var Finder */
+    private $finder;
+
+    private $rewite = false;
+
+    /**
+     * LDrawLoaderService constructor.
+     *
+     * @param LDViewService  $LDViewService
+     * @param RelationMapper $relationMapper
+     */
+    public function __construct($LDViewService, $relationMapper)
+    {
+        $this->LDViewService = $LDViewService;
+        $this->relationMapper = $relationMapper;
+        $this->ldModelParser = new LDModelParser();
+        $this->finder = new Finder();
+    }
+
+    /**
+     * @param bool $rewite
+     */
+    public function setRewite($rewite)
+    {
+        $this->rewite = $rewite;
+    }
+
+    /**
+     * @param $ldrawLibrary
+     */
+    public function setLDrawLibraryContext($ldrawLibrary)
+    {
+        try {
+            $adapter = new Local($ldrawLibrary);
+            $this->ldrawLibraryContext = new Filesystem($adapter);
+            $this->LDViewService->setLDrawLibraryContext($this->ldrawLibraryContext);
+        } catch (Exception $exception) {
+            $this->logger->error($exception->getMessage());
+        }
+    }
+
+    public function loadOneModel($file)
+    {
+        $connection = $this->em->getConnection();
+        try {
+            $connection->beginTransaction();
+
+            $this->loadModel($file);
+
+            $connection->commit();
+        } catch (\Exception $e) {
+            $connection->rollBack();
+            $this->logger->error($e->getMessage());
+        }
+    }
+
+    public function loadAllModels()
+    {
+        $files = $this->finder->in([
+            $this->ldrawLibraryContext->getAdapter()->getPathPrefix(),
+        ])->path('parts/')->name('*.dat')->depth(1)->files();
+
+        $this->initProgressBar($files->count());
+
+        /** @var SplFileInfo $file */
+        foreach ($files as $file) {
+            $connection = $this->em->getConnection();
+            $connection->beginTransaction();
+
+            try {
+                $this->progressBar->setMessage($file->getFilename(), 'filename');
+
+                $this->loadModel($file->getRealPath());
+
+                $connection->commit();
+            } catch (\Exception $exception) {
+                $connection->rollBack();
+                $this->logger->error($exception->getMessage());
+            }
+
+            $connection->close();
+
+            $this->progressBar->advance();
+        }
+        $this->progressBar->finish();
+    }
+
+    /**
+     * Load Model entity into database.
+     *
+     * @param $file
+     *
+     * @return Model|null|false
+     */
+    public function loadModel($file)
+    {
+        $fileContext = $this->getFileContext($file);
+
+        // Return model from database if rewrite is not enabled
+        if (!$this->rewite && $model = $this->em->getRepository(Model::class)->findOneByNumber(basename($file, '.dat'))) {
+            return $model;
+        }
+
+        // Parse model file save data to $modelArray
+        try {
+            $modelArray = $this->ldModelParser->parse($file);
+        } catch (ParseErrorException $e) {
+            $this->logger->error($e->getMessage(), [$file]);
+
+            return null;
+        } catch (FileException $e) {
+            $this->logger->error($e->getMessage(), [$file]);
+
+            return null;
+        }
+
+        // Check if model fulfills rules and should be loaded
+        if ($this->isModelIncluded($modelArray)) {
+            // Recursively load model parent (if any) and add model id as alias of parent
+            if (($parentId = $this->getParentId($modelArray)) && ($parentModelFile = $this->findSubmodelFile($parentId, $fileContext)) !== null) {
+                $parentModel = $this->loadModel($parentModelFile);
+
+                if ($parentModel) {
+                    $alias = $this->em->getRepository(Alias::class)->getOrCreate($modelArray['id'], $parentModel);
+                    $parentModel->addAlias($alias);
+
+                    $this->em->getRepository(Model::class)->save($parentModel);
+                } else {
+                    $this->logger->info('Model skipped. ', ['number' => $modelArray['id'], 'parent' => $modelArray['parent']]);
+                }
+
+                return $parentModel;
+            }
+            // Load model
+
+            $model = $this->em->getRepository(Model::class)->getOrCreate($modelArray['id']);
+
+            // Recursively load models of subparts
+            if (isset($modelArray['subparts'])) {
+                foreach ($modelArray['subparts'] as $subpartId => $count) {
+                    // Try to find model of subpart
+                    if (($subpartFile = $this->findSubmodelFile($subpartId, $fileContext)) !== null) {
+                        $subModel = $this->loadModel($subpartFile);
+                        if ($subModel) {
+                            $subpart = $this->em->getRepository(Subpart::class)->getOrCreate($model, $subModel, $count);
+                            $model->addSubpart($subpart);
+                        }
+                    } else {
+                        $this->logger->error('Subpart file not found', ['subpart' => $subpartId, 'model' => $modelArray]);
+                    }
+                }
+            }
+
+            // Add Keywords to model
+            if (isset($modelArray['keywords'])) {
+                foreach ($modelArray['keywords'] as $keyword) {
+                    $keyword = $this->em->getRepository(Keyword::class)->getOrCreate(stripslashes(strtolower(trim($keyword))));
+                    $model->addKeyword($keyword);
+                }
+            }
+
+            try {
+                // update model only if newer version
+                if (!$model->getModified() || ($model->getModified() < $modelArray['modified'])) {
+                    $stl = $this->LDViewService->datToStl($file, $rewrite)->getPath();
+                    $model->setPath($stl);
+
+                    $model
+                        ->setName($modelArray['name'])
+                        ->setCategory($this->em->getRepository(Category::class)->getOrCreate($modelArray['category']))
+                        ->setAuthor($this->em->getRepository(Author::class)->getOrCreate($modelArray['author']))
+                        ->setModified($modelArray['modified']);
+
+                    $this->em->getRepository(Model::class)->save($model);
+                }
+            } catch (ConvertingFailedException $e) {
+                $this->logger->error($e->getMessage());
+
+                return null;
+            }
+
+            return $model;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get parent id of model from alias_model.yml if defined or return parent id loaded by LDModelParser.
+     *
+     * Used to eliminate duplicites of models in library, that could not be determined automatically
+     *
+     * @param $modelArray
+     *
+     * @return string
+     */
+    private function getParentId($modelArray)
+    {
+        if ($this->relationMapper->find($modelArray['id'], 'alias_model') !== $modelArray['id']) {
+            return $this->relationMapper->find($modelArray['id'], 'alias_model');
+        }
+
+        return $modelArray['parent'];
+    }
+
+    /**
+     * Find submodel file inside model context or inside LDraw library.
+     *
+     *
+     * LDraw.org Standards: File Format 1.0.2 (http://www.ldraw.org/article/218.html)
+     *
+     *  "Sub-files can be located in the LDRAW\PARTS sub-directory, the LDRAW\P sub-directory, the LDRAW\MODELS sub-directory,
+     *  the current file's directory, a path relative to one of these directories, or a full path may be specified. Sub-parts are typically
+     *  stored in the LDRAW\PARTS\S sub-directory and so are referenced as s\subpart.dat, while hi-res primitives are stored in the
+     *  LDRAW\P\48 sub-directory and so referenced as 48\hires.dat"
+     *
+     *
+     * @param $id
+     * @param Filesystem $context
+     *
+     * @return string
+     */
+    private function findSubmodelFile($id, $context)
+    {
+        // Replace "\" directory separator used inside ldraw model files with system directoru separator
+        $filename = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($id).'.dat');
+
+        // Try to find model in current file's directory
+        if ($context->has($filename)) {
+            return $context->getAdapter()->getPathPrefix().$filename;
+        }
+        // Try to find model in current LDRAW\PARTS sub-directory
+        elseif ($this->ldrawLibraryContext->has('parts/'.$filename)) {
+            return $this->ldrawLibraryContext->getAdapter()->getPathPrefix().'parts'.DIRECTORY_SEPARATOR.$filename;
+        }
+        // Try to find model in current LDRAW\P sub-directory
+        elseif ($this->ldrawLibraryContext->has('p'.DIRECTORY_SEPARATOR.$filename)) {
+            return $this->ldrawLibraryContext->getAdapter()->getPathPrefix().'p'.DIRECTORY_SEPARATOR.$filename;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get new filesystem context of current file.
+     *
+     * @param $file
+     *
+     * @return Filesystem
+     */
+    private function getFileContext($file)
+    {
+        try {
+            $adapter = new Local(dirname($file));
+
+            return new Filesystem($adapter);
+        } catch (Exception $exception) {
+            $this->logger->error($exception->getMessage());
+        }
+    }
+
+    /**
+     * Determine if model file should be loaded into database.
+     *
+     * @param $modelArray
+     *
+     * @return bool
+     */
+    private function isModelIncluded($modelArray)
+    {
+        // Do not include part primitives and subparts
+        if (in_array($modelArray['type'], ['48_Primitive', '8_Primitive', 'Primitive', 'Subpart'])) {
+            return false;
+        }
+        // Do not include sticker models
+        elseif ($modelArray['type'] == 'Sticker') {
+            $this->logger->info('Model skipped.', ['number' => $modelArray['id'], 'type' => $modelArray['type']]);
+
+            return false;
+        }
+        // Do not include models without permission to redistribute
+        elseif ($modelArray['license'] != 'Redistributable under CCAL version 2.0') {
+            $this->logger->info('Model skipped.', ['number' => $modelArray['id'], 'license' => $modelArray['license']]);
+
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/src/AppBundle/Service/Loader/RebrickableLoader.php b/src/AppBundle/Service/Loader/RebrickableLoader.php
new file mode 100644
index 0000000..7df7f91
--- /dev/null
+++ b/src/AppBundle/Service/Loader/RebrickableLoader.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace AppBundle\Service\Loader;
+
+use AppBundle\Entity\Rebrickable\Part;
+use AppBundle\Entity\Rebrickable\Set;
+use Doctrine\ORM\Query\Expr\Join;
+
+//TODO Refactor + validate csv files
+class RebrickableLoader extends BaseLoader
+{
+    private $rebrickable_url;
+
+    private $csvFile;
+
+    /**
+     * ModelLoaderService constructor.
+     */
+    public function __construct($rebrickable_url)
+    {
+        $this->rebrickable_url = $rebrickable_url;
+    }
+
+    public function loadTables()
+    {
+        $connection = $this->em->getConnection();
+        $connection->beginTransaction();
+
+        try {
+            $this->loadCsvFiles();
+
+            $connection->prepare('SET foreign_key_checks = 0;')->execute();
+            $this->truncateTables();
+            $connection->prepare('SET foreign_key_checks = 1;')->execute();
+
+            $this->output->writeln([
+                '<info>Truncated</info> <comment>rebrickable</comment> <info>database tables.</info>',
+                '------------------------------------------------------------------------------',
+                'Loading CSV files into database...',
+            ]);
+
+            $this->loadColorTable($this->csvFile['colors']);
+            $this->loadCategoryTable($this->csvFile['part_categories']);
+            $this->loadPartTable($this->csvFile['parts']);
+            $this->loadThemeTable($this->csvFile['themes']);
+            $this->loadSetTable($this->csvFile['sets']);
+            $this->loadInventoryTable($this->csvFile['inventories']);
+            $this->loadInventorySetTable($this->csvFile['inventory_sets']);
+
+            $connection->prepare('SET foreign_key_checks = 0;')->execute();
+            $this->loadInventoryPartTable($this->csvFile['inventory_parts']);
+            $connection->prepare('SET foreign_key_checks = 1;')->execute();
+            $this->addMissingParts();
+
+            $connection->commit();
+
+            $this->output->writeln('Rebrickable database loaded successfully!');
+        } catch (\Exception $e) {
+            $connection->rollBack();
+            throw $e;
+        }
+    }
+
+    private function loadCSVFiles()
+    {
+        $array = ['inventories', 'inventory_parts', 'inventory_sets', 'sets', 'themes', 'parts', 'part_categories', 'colors'];
+
+        $this->output->writeln([
+            'Loading Rebrickable CSV files',
+            '------------------------------------------------------------------------------',
+        ]);
+
+        foreach ($array as $item) {
+            $this->csvFile[$item] = $this->downloadFile($this->rebrickable_url.$item.'.csv');
+        }
+
+        $this->output->writeln([
+            '<info>Done</info>',
+            '------------------------------------------------------------------------------',
+        ]);
+    }
+
+    private function truncateTables()
+    {
+        $query = '
+            TRUNCATE TABLE rebrickable_inventory_parts;
+            TRUNCATE TABLE rebrickable_inventory_sets;
+            TRUNCATE TABLE rebrickable_inventory;
+            TRUNCATE TABLE rebrickable_set;
+            TRUNCATE TABLE rebrickable_theme;
+            TRUNCATE TABLE rebrickable_part;
+            TRUNCATE TABLE rebrickable_category;
+            TRUNCATE TABLE rebrickable_color;
+           ';
+
+        return $this->em->getConnection()->prepare($query)->execute();
+    }
+
+    private function loadCsvFile($file, $table, $columns)
+    {
+        $query = sprintf("LOAD DATA LOCAL INFILE '%s' 
+            REPLACE INTO TABLE %s
+            FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'
+            LINES TERMINATED BY '\\n'
+            IGNORE 1 LINES %s", addslashes($file), $table, $columns);
+
+        return $this->em->getConnection()->prepare($query)->execute();
+    }
+
+    private function addMissingParts()
+    {
+        $connection = $this->em->getConnection();
+        $statement = $connection->prepare(
+            'SELECT DISTINCT rebrickable_inventory_parts.part_id FROM rebrickable_inventory_parts
+                 LEFT JOIN rebrickable_part ON rebrickable_inventory_parts.part_id = rebrickable_part.id
+                 WHERE rebrickable_part.id IS NULL');
+        $statement->execute();
+        $foreignKeys = $statement->fetchAll();
+
+        foreach ($foreignKeys as $foreignKey) {
+            $part = new Part();
+            $part->setNumber($foreignKey['part_id']);
+            $this->em->getRepository(Part::class)->save($part);
+        }
+    }
+
+    private function loadInventoryTable($csv)
+    {
+        return $this->loadCsvFile($csv, 'rebrickable_inventory', '(`id`,`version`,`set_id`)');
+    }
+
+    private function loadInventoryPartTable($csv)
+    {
+        return $this->loadCsvFile($csv, 'rebrickable_inventory_parts', '(`inventory_id`,`part_id`,`color_id`,`quantity`, @var) SET spare = IF(@var=\'t\',1,0)');
+    }
+
+    private function loadInventorySetTable($csv)
+    {
+        return $this->loadCsvFile($csv, 'rebrickable_inventory_sets', '(`inventory_id`,`set_id`,`quantity`)');
+    }
+
+    private function loadSetTable($csv)
+    {
+        return $this->loadCsvFile($csv, 'rebrickable_set', '(`id`,`name`,`year`,`theme_id`,`num_parts`)');
+    }
+
+    private function loadThemeTable($csv)
+    {
+        return $this->loadCsvFile($csv, 'rebrickable_theme', '(`id`,`name`,@var) SET parent_id = nullif(@var,\'\')');
+    }
+
+    private function loadPartTable($csv)
+    {
+        return $this->loadCsvFile($csv, 'rebrickable_part', '(`id`,`name`,`category_id`)');
+    }
+
+    private function loadCategoryTable($csv)
+    {
+        return $this->loadCsvFile($csv, 'rebrickable_category', '(`id`,`name`)');
+    }
+
+    private function loadColorTable($csv)
+    {
+        return $this->loadCsvFile($csv, 'rebrickable_color', '(`id`,`name`,`rgb`, @var) SET transparent = IF(@var=\'t\',1,0)');
+    }
+}
diff --git a/src/AppBundle/Service/Loader/RebrickableLoaderService.php b/src/AppBundle/Service/Loader/RebrickableLoaderService.php
deleted file mode 100644
index 5f80c85..0000000
--- a/src/AppBundle/Service/Loader/RebrickableLoaderService.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace AppBundle\Service\Loader;
-
-use AppBundle\Entity\Rebrickable\Set;
-
-//TODO Refactor + validate csv files
-class RebrickableLoaderService extends BaseLoaderService
-{
-    private $rebrickable_url;
-
-    /**
-     * ModelLoaderService constructor.
-     */
-    public function __construct($rebrickable_url)
-    {
-        $this->rebrickable_url = $rebrickable_url;
-    }
-
-    public function loadTables()
-    {
-        $connection = $this->em->getConnection();
-
-        try {
-            $connection->beginTransaction();
-            $connection->prepare('SET foreign_key_checks = 0;')->execute();
-
-            $this->truncateTables();
-            $this->loadColorTable();
-            $this->loadPartTable();
-            $this->loadCategoryTable();
-            $this->loadThemeTable();
-            $this->loadSetTable();
-            $this->loadInventoryTable();
-            $this->loadInventoryPartTable();
-
-            $connection->prepare('SET foreign_key_checks = 1;')->execute();
-            $connection->commit();
-        } catch (\Exception $e) {
-            $connection->rollBack();
-            throw $e;
-        }
-    }
-
-    private function truncateTables()
-    {
-        $query =
-            'TRUNCATE TABLE rebrickable_inventory_parts;
-            TRUNCATE TABLE rebrickable_color;
-            TRUNCATE TABLE rebrickable_inventory;
-            TRUNCATE TABLE rebrickable_set;
-            TRUNCATE TABLE rebrickable_theme;
-            TRUNCATE TABLE rebrickable_part;
-            TRUNCATE TABLE rebrickable_category;
-           ';
-
-        return $this->em->getConnection()->prepare($query)->execute();
-    }
-
-    private function loadCsvFile($file, $table, $columns)
-    {
-        $query = sprintf("LOAD DATA LOCAL INFILE '%s' 
-            REPLACE INTO TABLE %s
-            FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'
-            LINES TERMINATED BY '\\n'
-            IGNORE 1 LINES %s", addslashes($file), $table, $columns);
-
-        return $this->em->getConnection()->prepare($query)->execute();
-    }
-
-    private function loadInventoryTable()
-    {
-        $file = $this->downloadFile($this->rebrickable_url.'inventories.csv');
-
-        return $this->loadCsvFile($file, 'rebrickable_inventory', '(`id`,`version`,`set_id`)');
-    }
-
-    private function loadInventoryPartTable()
-    {
-        $file = $this->downloadFile($this->rebrickable_url.'inventory_parts.csv');
-
-        return $this->loadCsvFile($file, 'rebrickable_inventory_parts', '(`inventory_id`,`part_id`,`color_id`,`quantity`, @var) SET spare = IF(@var=\'t\',1,0)');
-    }
-
-    private function loadSetTable()
-    {
-        $file = $this->downloadFile($this->rebrickable_url.'sets.csv');
-
-        return $this->loadCsvFile($file, 'rebrickable_set', '(`id`,`name`,`year`,`theme_id`,`num_parts`)');
-    }
-
-    private function loadThemeTable()
-    {
-        $file = $this->downloadFile($this->rebrickable_url.'themes.csv');
-
-        return $this->loadCsvFile($file, 'rebrickable_theme', '(`id`,`name`,@var) SET parent_id = nullif(@var,\'\')');
-    }
-
-    private function loadPartTable()
-    {
-        $file = $this->downloadFile($this->rebrickable_url.'parts.csv');
-
-        return $this->loadCsvFile($file, 'rebrickable_part', '(`id`,`name`,`category_id`)');
-    }
-
-    private function loadCategoryTable()
-    {
-        $file = $this->downloadFile($this->rebrickable_url.'part_categories.csv');
-
-        return $this->loadCsvFile($file, 'rebrickable_category', '(`id`,`name`)');
-    }
-
-    private function loadColorTable()
-    {
-        $file = $this->downloadFile($this->rebrickable_url.'colors.csv');
-
-        return $this->loadCsvFile($file, 'rebrickable_color', '(`id`,`name`,`rgb`, @var) SET transparent = IF(@var=\'t\',1,0)');
-    }
-}
diff --git a/src/AppBundle/Service/Loader/RelationLoader.php b/src/AppBundle/Service/Loader/RelationLoader.php
index d3be510..7ceaf73 100644
--- a/src/AppBundle/Service/Loader/RelationLoader.php
+++ b/src/AppBundle/Service/Loader/RelationLoader.php
@@ -5,16 +5,12 @@ namespace AppBundle\Service\Loader;
 use AppBundle\Api\Manager\RebrickableManager;
 use AppBundle\Entity\LDraw\Model;
 use AppBundle\Entity\Rebrickable\Part;
-use AppBundle\Manager\LDraw\ModelManager;
-use AppBundle\Repository\Rebrickable\PartRepository;
+use AppBundle\Utils\RelationMapper;
 
-class RelationLoader extends BaseLoaderService
+class RelationLoader extends BaseLoader
 {
-    /** @var ModelManager */
-    private $modelManager;
-
-    /** @var PartRepository */
-    private $partRepository;
+    /** @var RelationMapper */
+    private $relationMapper;
 
     /** @var RebrickableManager */
     private $rebrickableAPIManager;
@@ -22,23 +18,18 @@ class RelationLoader extends BaseLoaderService
     /**
      * RelationLoader constructor.
      *
-     * @param $ldrawPartManager
-     * @param $rebrickablePartRepository
+     * @param RebrickableManager $rebrickableApiManager
+     * @param RelationMapper     $relationMapper
      */
-    public function __construct($modelManager, $partRepository, $rebrickableApiManager)
+    public function __construct($rebrickableApiManager, $relationMapper)
     {
-        $this->modelManager = $modelManager;
-        $this->partRepository = $partRepository;
         $this->rebrickableAPIManager = $rebrickableApiManager;
+        $this->relationMapper = $relationMapper;
     }
 
-
-    /**
-     *
-     */
     public function loadAll()
     {
-        $parts = $this->partRepository->findAll();
+        $parts = $this->em->getRepository(Part::class)->findAll();
 
         $this->initProgressBar(count($parts));
         /** @var Part $part */
@@ -50,46 +41,45 @@ class RelationLoader extends BaseLoaderService
         $this->progressBar->finish();
     }
 
-    /**
-     *
-     */
     public function loadNotPaired()
     {
-        $parts = $this->partRepository->findAllNotPaired();
+        $parts = $this->em->getRepository(Part::class)->findAllNotPaired();
 
         $this->initProgressBar(count($parts));
         /** @var Part $part */
         foreach ($parts as $part) {
             $this->load($part);
-
+            $this->progressBar->setMessage($part->getNumber(), 'filename');
             $this->progressBar->advance();
         }
         $this->progressBar->finish();
     }
 
     /**
-     * Loads relations between Rebrickable part and ldraw models for $parts
+     * Loads relations between Rebrickable part and ldraw models for $parts.
      *
      * @param Part $part
      *
      * @return Model $m
      */
-    private function load($part)
+    private function load(Part $part)
     {
+        $modelRepository = $this->em->getRepository(Model::class);
+
         $number = $part->getNumber();
-        $model = $this->modelManager->findByNumber($number);
+        $model = $modelRepository->findOneByNumber($number);
         if (!$model) {
             $number = $this->relationMapper->find($this->getPrintedParentId($number), 'part_model');
-            $model = $this->modelManager->findByNumber($number);
+            $model = $modelRepository->findOneByNumber($number);
 
             if (!$model) {
-                $model = $this->modelManager->findByName($part->getName());
+                $model = $modelRepository->findOneByName($part->getName());
             }
         }
 
         if ($model) {
             $part->setModel($model);
-            $this->partRepository->save($part);
+            $this->em->getRepository(Part::class)->save($part);
         }
     }
 
diff --git a/src/AppBundle/Service/ZipService.php b/src/AppBundle/Service/ZipService.php
new file mode 100644
index 0000000..7be9188
--- /dev/null
+++ b/src/AppBundle/Service/ZipService.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace AppBundle\Service;
+
+class ZipService
+{
+
+}
\ No newline at end of file
diff --git a/src/AppBundle/Tests/Controller/LDraw/CategoryControllerTest.php b/src/AppBundle/Tests/Controller/LDraw/CategoryControllerTest.php
new file mode 100644
index 0000000..92cc221
--- /dev/null
+++ b/src/AppBundle/Tests/Controller/LDraw/CategoryControllerTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace AppBundle\Tests\Controller\LDraw;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class CategoryControllerTest extends WebTestCase
+{
+    /*
+    public function testCompleteScenario()
+    {
+        // Create a new client to browse the application
+        $client = static::createClient();
+
+        // Go to the list view
+        $crawler = $client->request('GET', '/ldraw_category/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode(), "Unexpected HTTP status code for GET /ldraw_category/");
+
+        // Go to the show view
+        $crawler = $client->click($crawler->selectLink('show')->link());
+        $this->assertEquals(200, $client->getResponse()->getStatusCode(), "Unexpected HTTP status code");
+    }
+
+    */
+}
diff --git a/src/AppBundle/Tests/Controller/LDraw/PartControllerTest.php b/src/AppBundle/Tests/Controller/LDraw/PartControllerTest.php
new file mode 100644
index 0000000..4a1b64f
--- /dev/null
+++ b/src/AppBundle/Tests/Controller/LDraw/PartControllerTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace AppBundle\Tests\Controller\LDraw;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class PartControllerTest extends WebTestCase
+{
+    /*
+    public function testCompleteScenario()
+    {
+        // Create a new client to browse the application
+        $client = static::createClient();
+
+        // Go to the list view
+        $crawler = $client->request('GET', '/ldraw_part/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode(), "Unexpected HTTP status code for GET /ldraw_part/");
+
+        // Go to the show view
+        $crawler = $client->click($crawler->selectLink('show')->link());
+        $this->assertEquals(200, $client->getResponse()->getStatusCode(), "Unexpected HTTP status code");
+    }
+
+    */
+}
diff --git a/src/AppBundle/Twig/AppExtension.php b/src/AppBundle/Twig/AppExtension.php
new file mode 100644
index 0000000..74e3cb1
--- /dev/null
+++ b/src/AppBundle/Twig/AppExtension.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace AppBundle\Twig;
+
+use AppBundle\Api\Manager\RebrickableManager;
+
+class AppExtension extends \Twig_Extension
+{
+    /** @var RebrickableManager */
+    private $rebrickableAPIManager;
+
+    /**
+     * AppExtension constructor.
+     *
+     * @param RebrickableManager $rebrickableAPIManager
+     */
+    public function __construct($rebrickableAPIManager)
+    {
+        $this->rebrickableAPIManager = $rebrickableAPIManager;
+    }
+
+    public function getFilters()
+    {
+        return [
+            new \Twig_SimpleFilter('partImage', [$this, 'partImage']),
+            new \Twig_SimpleFilter('setImage', [$this, 'setImage']),
+        ];
+    }
+
+    public function getFunctions()
+    {
+        return [
+            new \Twig_SimpleFunction('remoteSize', [$this, 'remoteSize']),
+            new \Twig_SimpleFunction('remoteFilename', [$this, 'remoteFilename']),
+        ];
+    }
+
+    public function partImage($number, $color = null)
+    {
+        return '/parts/ldraw/'.($color ? $color : '-1').'/'.$number.'.png';
+    }
+
+    public function setImage($number)
+    {
+        return '/sets/'.strtolower($number).'.jpg';
+    }
+
+    public function remoteSize($url)
+    {
+        $ch = curl_init($url);
+
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HEADER, true);
+        curl_setopt($ch, CURLOPT_NOBODY, true);
+
+        $data = curl_exec($ch);
+        $size = curl_getinfo($ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD);
+
+        curl_close($ch);
+
+        return $size;
+    }
+
+    public function remoteFilename($url)
+    {
+        return basename($url);
+    }
+}
diff --git a/src/AppBundle/Utils/DatParser.php b/src/AppBundle/Utils/DatParser.php
deleted file mode 100644
index 7ea6aa7..0000000
--- a/src/AppBundle/Utils/DatParser.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-namespace AppBundle\Utils;
-
-use League\Flysystem\File;
-use Symfony\Component\Asset\Exception\LogicException;
-
-class DatParser
-{
-    /** @var RelationMapper */
-    protected $relationMapper;
-
-    /**
-     * DatParser constructor.
-     *
-     * @param RelationMapper $relationMapper
-     */
-    public function __construct($relationMapper)
-    {
-        $this->relationMapper = $relationMapper;
-    }
-
-    /**
-     * Parse LDraw .dat file header identifying model store data to array.
-     *
-     * [
-     *  'id' => string
-     *  'name' => string
-     *  'category' => string
-     *  'keywords' => []
-     *  'author' => string
-     *  'modified' => DateTime
-     *  'type' => string
-     *  'subparts' => []
-     * ]
-     *
-     * LDraw.org Standards: Official Library Header Specification (http://www.ldraw.org/article/398.html)
-     *
-     * @return array
-     */
-    public function parse(File $file)
-    {
-        $header = [];
-
-        $handle = $file->readStream();
-
-        if ($handle) {
-            $firstLine = false;
-
-            while (($line = fgets($handle)) !== false) {
-                $line = trim($line);
-
-                // Comments or META Commands
-                if (strpos($line, '0 ') === 0) {
-                    $line = preg_replace('/^0 /', '', $line);
-
-                    // 0 <CategoryName> <PartDescription>
-                    if (!$firstLine) {
-                        $array = explode(' ', ltrim(trim($line, 2), '=_~'));
-                        $header['category'] = isset($array[0]) ? $array[0] : '';
-                        $header['name'] = preg_replace('/ {2,}/', ' ', ltrim($line, '=_'));
-
-                        $firstLine = true;
-                    }
-                    // 0 !CATEGORY <CategoryName>
-                    elseif (strpos($line, '!CATEGORY ') === 0) {
-                        $header['category'] = trim(preg_replace('/^!CATEGORY /', '', $line));
-                    }
-                    // 0 !KEYWORDS <first keyword>, <second keyword>, ..., <last keyword>
-                    elseif (strpos($line, '!KEYWORDS ') === 0) {
-                        $header['keywords'] = explode(', ', preg_replace('/^!KEYWORDS /', '', $line));
-                    }
-                    // 0 Name: <Filename>.dat
-                    elseif (strpos($line, 'Name: ') === 0) {
-                        if (!isset($header['id'])) {
-                            $header['id'] = preg_replace('/(^Name: )(.*)(.dat)/', '$2', $line);
-                        }
-                    }
-                    // 0 Author: <Realname> [<Username>]
-                    elseif (strpos($line, 'Author: ') === 0) {
-                        $header['author'] = preg_replace('/^Author: /', '', $line);
-                    }
-                    // 0 !LDRAW_ORG Part|Subpart|Primitive|48_Primitive|Shortcut (optional qualifier(s)) ORIGINAL|UPDATE YYYY-RR
-                    elseif (strpos($line, '!LDRAW_ORG ') === 0) {
-                        $type = preg_replace('/(^!LDRAW_ORG )(.*)( UPDATE| ORIGINAL)(.*)/', '$2', $line);
-
-                        $header['type'] = $type;
-
-                        // Last modification date in format YYYY-RR
-                        $date = preg_replace('/(^!LDRAW_ORG )(.*)( UPDATE | ORIGINAL )(.*)/', '$4', $line);
-                        if (preg_match('/^[1-2][0-9]{3}-[0-9]{2}$/', $date)) {
-                            $header['modified'] = \DateTime::createFromFormat('Y-m-d H:i:s', $date.'-01 00:00:00');
-                        } else {
-                            $header['modified'] = null;
-                        }
-                    }
-                } elseif (strpos($line, '1 ') === 0) {
-                    $header['subparts'][] = $this->getAlias($line);
-                }
-            }
-
-            if ($this->isStickerShortcutPart($header['name'], $header['id'])) {
-                $header['type'] = 'Sticker';
-            } elseif (($parent = $this->relationMapper->find($header['id'], 'alias_model')) != $header['id']) {
-                $header['type'] = 'Alias';
-                $header['parent'] = $parent;
-            } elseif (isset($header['subparts']) && count($header['subparts']) == 1 && in_array($header['type'], ['Part Alias', 'Shortcut Physical_Colour', 'Shortcut Alias', 'Part Physical_Colour'])) {
-                $header['parent'] = $header['subparts'][0];
-                $header['subparts'] = null;
-            } elseif ($parent = $this->getPrintedParentId($header['id'])) {
-                $header['type'] = 'Printed';
-                $header['parent'] = $parent;
-            } elseif ($parent = $this->getObsoleteParentId($header['name'])) {
-                $header['type'] = 'Alias';
-                $header['parent'] = $parent;
-            } elseif (strpos($header['name'], '~') === 0 && $header['type'] != 'Alias') {
-                $header['type'] = 'Obsolete/Subpart';
-            }
-
-            $header['name'] = ltrim($header['name'], '~');
-
-            fclose($handle);
-
-            return $header;
-        }
-
-        throw new LogicException('Error parsing DAT file'); //TODO
-    }
-
-    /**
-     * Get file reference from part line.
-     *
-     * Line type 1 is a sub-file reference. The generic format is:
-     *  1 <colour> x y z a b c d e f g h i <file>
-     *
-     * LDraw.org Standards: File Format 1.0.2 (http://www.ldraw.org/article/218.html)
-     *
-     * @param $line
-     *
-     * @return string|null Filename of referenced part
-     */
-    public function getAlias($line)
-    {
-        if (preg_match('/^1(.*) (.*)\.(dat|DAT)$/', $line, $matches)) {
-            return $matches[2];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get printed part parent id.
-     *
-     *  part name in format:
-     *  nnnPxx, nnnnPxx, nnnnnPxx, nnnaPxx, nnnnaPxx (a = alpha, n= numeric, x = alphanumeric)
-     *
-     *  http://www.ldraw.org/library/tracker/ref/numberfaq/
-     *
-     * @param $id
-     *
-     * @return string|null LDraw number of printed part parent
-     */
-    public function getPrintedParentId($id)
-    {
-        if (preg_match('/(^.*)(p[0-9a-z][0-9a-z][0-9a-z]{0,1})$/', $id, $matches)) {
-            return $matches[1];
-        }
-
-        return null;
-    }
-
-    /**
-     * Check if part is shortcut part of stricker and part.
-     *
-     * part name in format:
-     *  nnnDnn, nnnnDnn, nnnnnDnn (a = alpha, n= numeric, x = alphanumeric)
-     *
-     *  http://www.ldraw.org/library/tracker/ref/numberfaq/
-     *
-     * @param $name
-     * @param $number
-     *
-     * @return string|null LDraw number of printed part parent
-     */
-    public function isStickerShortcutPart($name, $number)
-    {
-        if (strpos($name, 'Sticker') === 0) {
-            return true;
-        }
-
-        // Check if in format nnnDaa == sticker
-        return preg_match('/(^.*)(d[a-z0-9][a-z0-9])$/', $number);
-    }
-
-    /**
-     * Get parent of obsolete part kept for reference.
-     *
-     *  part description in format:
-     *  ~Moved to {new_number}
-     *
-     * http://www.ldraw.org/article/398.html  (Appendix II (02-Oct-06))
-     *
-     * @param $name
-     *
-     * @return string|null Filename of referenced part
-     */
-    public function getObsoleteParentId($name)
-    {
-        if (preg_match('/^(~Moved to )(.*)$/', $name, $matches)) {
-            return $matches[2];
-        }
-
-        return null;
-    }
-}
diff --git a/src/AppBundle/Utils/LDModelParser.php b/src/AppBundle/Utils/LDModelParser.php
new file mode 100644
index 0000000..a789fc5
--- /dev/null
+++ b/src/AppBundle/Utils/LDModelParser.php
@@ -0,0 +1,223 @@
+<?php
+
+namespace AppBundle\Utils;
+
+use AppBundle\Exception\FileNotFoundException;
+use AppBundle\Exception\ParseErrorException;
+use League\Flysystem\File;
+
+class LDModelParser
+{
+    /**
+     * Parse LDraw  model .dat file and return associative array in format:
+     * [
+     *  'id' => string
+     *  'name' => string
+     *  'category' => string
+     *  'keywords' => []
+     *  'author' => string
+     *  'modified' => DateTime
+     *  'type' => string
+     *  'subparts' => [],
+     *  'licence' => string
+     * ].
+     *
+     * LDraw.org Standards: Official Library Header Specification (http://www.ldraw.org/article/398.html)
+     *
+     * @throws FileNotFoundException|ParseErrorException
+     *
+     * @return array
+     */
+    public function parse($file)
+    {
+        if (file_exists($file)) {
+            $model = [
+                'id' => null,
+                'name' => null,
+                'category' => null,
+                'keywords' => [],
+                'author' => null,
+                'modified' => null,
+                'type' => null,
+                'subparts' => [],
+                'parent' => null,
+                'license' => null,
+            ];
+
+            try {
+                $handle = fopen($file, 'r');
+
+                if ($handle) {
+                    $firstLine = false;
+
+                    while (($line = fgets($handle)) !== false) {
+                        $line = trim($line);
+
+                        // Comments or META Commands
+                        if (strpos($line, '0 ') === 0) {
+                            $line = preg_replace('/^0 /', '', $line);
+
+                            // 0 <CategoryName> <PartDescription>
+                            if (!$firstLine) {
+                                $array = explode(' ', ltrim(trim($line, 2), '=_~'));
+                                $model['category'] = isset($array[0]) ? $array[0] : '';
+                                $model['name'] = preg_replace('/ {2,}/', ' ', ltrim($line, '=_'));
+
+                                $firstLine = true;
+                            }
+                            // 0 !CATEGORY <CategoryName>
+                            elseif (strpos($line, '!CATEGORY ') === 0) {
+                                $model['category'] = trim(preg_replace('/^!CATEGORY /', '', $line));
+                            }
+                            // 0 !KEYWORDS <first keyword>, <second keyword>, ..., <last keyword>
+                            elseif (strpos($line, '!KEYWORDS ') === 0) {
+                                $model['keywords'] = explode(', ', preg_replace('/^!KEYWORDS /', '', $line));
+                            }
+                            // 0 Name: <Filename>.dat
+                            elseif (strpos($line, 'Name: ') === 0 && !isset($header['id'])) {
+                                $model['id'] = preg_replace('/(^Name: )(.*)(.dat)/', '$2', $line);
+                            }
+                            // 0 Author: <Realname> [<Username>]
+                            elseif (strpos($line, 'Author: ') === 0) {
+                                $model['author'] = preg_replace('/^Author: /', '', $line);
+                            }
+                            // 0 !LDRAW_ORG Part|Subpart|Primitive|48_Primitive|Shortcut (optional qualifier(s)) ORIGINAL|UPDATE YYYY-RR
+                            elseif (strpos($line, '!LDRAW_ORG ') === 0) {
+                                $type = preg_replace('/(^!LDRAW_ORG )(.*)( UPDATE| ORIGINAL)(.*)/', '$2', $line);
+
+                                $model['type'] = $type;
+
+                                // Last modification date in format YYYY-RR
+                                $date = preg_replace('/(^!LDRAW_ORG )(.*)( UPDATE | ORIGINAL )(.*)/', '$4', $line);
+                                if (preg_match('/^[1-2][0-9]{3}-[0-9]{2}$/', $date)) {
+                                    $model['modified'] = \DateTime::createFromFormat('Y-m-d H:i:s', $date.'-01 00:00:00');
+                                }
+                            }
+                            // 0 !LICENSE Redistributable under CCAL version 2.0 : see CAreadme.txt | 0 !LICENSE Not redistributable : see NonCAreadme.txt
+                            elseif (strpos($line, '!LICENSE ') === 0) {
+                                $model['license'] = preg_replace('/(^!LICENSE )(.*) : (.*)$/', '$2', $line);
+                            }
+                        } elseif (strpos($line, '1 ') === 0) {
+                            $id = strtolower($this->getReferencedModelNumber($line));
+
+                            if (isset($model['subparts'][$id])) {
+                                $model['subparts'][$id] = $model['subparts'][$id] + 1;
+                            } else {
+                                $model['subparts'][$id] = 1;
+                            }
+                        } elseif (!empty($line) && !in_array($line[0], ['2', '3', '4', '5'])) {
+                            throw new ErrorParsingLineException($file,$line);
+                        }
+                    }
+
+                    if ($this->isSticker($model['name'], $model['id'])) {
+                        $model['type'] = 'Sticker';
+                    } elseif (count($model['subparts']) == 1 && in_array($model['type'], ['Part Alias', 'Shortcut Physical_Colour', 'Shortcut Alias', 'Part Physical_Colour'])) {
+                        $model['parent'] = array_keys($model['subparts'])[0];
+                    } elseif (($parent = $this->getPrintedModelParentNumber($model['id'])) && !in_array($model['type'], ['48_Primitive', '8_Primitive', 'Primitive', 'Subpart'])) {
+                        $model['type'] = 'Printed';
+                        $model['parent'] = $parent;
+                    } elseif ($parent = $this->getObsoleteModelParentNumber($model['name'])) {
+                        $model['type'] = 'Alias';
+                        $model['parent'] = $parent;
+                    }
+
+                    fclose($handle);
+
+                    return $model;
+                }
+            } catch (\Exception $exception) {
+                throw new ParseErrorException($file);
+            }
+        }
+        throw new FileNotFoundException($file);
+    }
+
+    /**
+     * Get file reference from part line.
+     *
+     * Line type 1 is a sub-file reference. The generic format is:
+     *  1 <colour> x y z a b c d e f g h i <file>
+     *
+     * LDraw.org Standards: File Format 1.0.2 (http://www.ldraw.org/article/218.html)
+     *
+     * @param $line
+     *
+     * @return string|null Filename of referenced part
+     */
+    public function getReferencedModelNumber($line)
+    {
+        $line = ($line);
+
+        if (preg_match('/^1(.*) (.*)\.dat$/', strtolower($line), $matches)) {
+            return str_replace('\\', DIRECTORY_SEPARATOR, $matches[2]);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get printed part parent id.
+     *
+     *  part name in format:
+     *  nnnPxx, nnnnPxx, nnnnnPxx, nnnaPxx, nnnnaPxx (a = alpha, n= numeric, x = alphanumeric)
+     *
+     *  http://www.ldraw.org/library/tracker/ref/numberfaq/
+     *
+     * @param $id
+     *
+     * @return string|null LDraw number of printed part parent
+     */
+    public function getPrintedModelParentNumber($id)
+    {
+        if (preg_match('/(^.*)(p[0-9a-z]{2,3})$/', $id, $matches)) {
+            return $matches[1];
+        }
+
+        return null;
+    }
+
+    /**
+     * Check if part is shortcut part of stricker and part.
+     *
+     * part name in format:
+     *  nnnDnn, nnnnDnn, nnnnnDnn (a = alpha, n= numeric, x = alphanumeric)
+     *
+     *  http://www.ldraw.org/library/tracker/ref/numberfaq/
+     *
+     * @param $name
+     * @param $number
+     *
+     * @return bool
+     */
+    public function isSticker($name, $number)
+    {
+        if (strpos($name, 'Sticker') === 0) {
+            return true;
+        }
+
+        // Check if in format n*Daa == sticker
+        return preg_match('/(^.*)(d[0-9]{2})$/', $number);
+    }
+
+    /**
+     * Get parent of obsolete part kept for reference.
+     *
+     *  part description in format:
+     *  ~Moved to {new_number}
+     *
+     * http://www.ldraw.org/article/398.html  (Appendix II (02-Oct-06))
+     *
+     * @param $name
+     *
+     * @return string|null Filename of referenced part
+     */
+    public function getObsoleteModelParentNumber($name)
+    {
+        if (preg_match('/^(~Moved to )(.*)$/', $name, $matches)) {
+            return str_replace('\\', DIRECTORY_SEPARATOR, $matches[2]);
+        }
+
+        return null;
+    }
+}
diff --git a/src/AppBundle/Utils/Stats.php b/src/AppBundle/Utils/Stats.php
new file mode 100644
index 0000000..64d0fee
--- /dev/null
+++ b/src/AppBundle/Utils/Stats.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace AppBundle\Utils;
+
+class Stats
+{
+    private $success;
+
+    private $error;
+
+    private $skipped;
+
+    /**
+     * Stats constructor.
+     */
+    public function __construct()
+    {
+        $this->skipped = 0;
+        $this->error = 0;
+        $this->success = 0;
+    }
+
+    public function success()
+    {
+        $this->success = $this->success + 1;
+    }
+
+    public function error()
+    {
+        $this->error = $this->error + 1;
+    }
+
+    public function skipped()
+    {
+        $this->skipped = $this->skipped + 1;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSuccess()
+    {
+        return $this->success;
+    }
+
+    /**
+     * @return int
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSkipped()
+    {
+        return $this->skipped;
+    }
+}
diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php
index 7e7723a..7e7a99d 100644
--- a/var/SymfonyRequirements.php
+++ b/var/SymfonyRequirements.php
@@ -780,7 +780,11 @@ class SymfonyRequirements extends RequirementCollection
     {
         $size = ini_get('realpath_cache_size');
         $size = trim($size);
-        $unit = strtolower(substr($size, -1, 1));
+        $unit = '';
+        if (!ctype_digit($size)) {
+            $unit = strtolower(substr($size, -1, 1));
+            $size = (int) substr($size, 0, -1);
+        }
         switch ($unit) {
             case 'g':
                 return $size * 1024 * 1024 * 1024;
diff --git a/web/config.php b/web/config.php
index a031a3a..69df43c 100644
--- a/web/config.php
+++ b/web/config.php
@@ -270,7 +270,7 @@ $hasMinorProblems = (bool) count($minorProblems);
             }
             .sf-reset ul a,
             .sf-reset ul a:hover {
-                background: url(../images/blue-arrow.png) no-repeat right 6px;
+                background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAICAYAAAAx8TU7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFdJREFUeNpiYACBjjOhDEiACSggCKTLgXQ5TJARqhIkcReIKxgqTGYxwvV0nDEGkmeAOIwJySiQ4HsgvseIpGo3ELsCtZ9lRDIvDCiwhwHJPEFkJwEEGACq6hdnax8y1AAAAABJRU5ErkJggg==) no-repeat right 7px;
                 padding-right: 10px;
             }
             .sf-reset ul, ol {