--- a/app/query-app.component.ts	Thu Jan 21 20:22:02 2016 +0100
+++ b/app/query-app.component.ts	Fri Jan 22 17:32:33 2016 +0100
@@ -1,19 +1,22 @@
 import {Component} from 'angular2/core';
 import {HTTP_PROVIDERS} from 'angular2/http';
 
-import {QueryService} from './query.service';
 import {QueryState} from './query-state';
 import {QueryStep} from './query-step';
 
+import {QueryService} from './query.service';
+import {NormalizationService} from './normalization.service';
+
 import {QuerySelectComponent} from './query-select.component';
 import {QueryResultComponent} from './query-result.component';
+//import {QueryResultTableComponent} from './query-result-table.component';
 
 @Component({
     selector: 'query-app',
     template: `
         <h1>ISMI-Lab Query Builder</h1>
         <div>Select a query step:</div>
-        <query-select *ngFor="#step of querySteps; #i=index;"
+        <query-select *ngFor="#step of queryStepList; #i=index;"
             [queryStep]="step" [index]="i" 
             (queryChanged)="onQueryChanged($event)"></query-select>
         <div>
@@ -23,25 +26,25 @@
         <query-result [queryState]="queryState"></query-result>
         `,
     directives: [QuerySelectComponent, QueryResultComponent],
-    providers: [QueryService, HTTP_PROVIDERS]
+    providers: [QueryService, NormalizationService, HTTP_PROVIDERS]
 })
     
 export class QueryAppComponent { 
     public queryState: QueryState;
-    public querySteps: QueryStep[];
+    public queryStepList: string[];
         
     constructor(private _queryService: QueryService) {
         this._queryService.setup();
-        this.querySteps = [];
+        this.queryStepList = [];
         this.addQueryStep();
     }
     
     addQueryStep() {
-        this.querySteps.push({'mode': null});
+        this.queryStepList.push('step');
     }
     
     removeQueryStep() {
-        this.querySteps.pop();
+        this.queryStepList.pop();
         this._queryService.state.steps.pop();
     }