diff --git a/18 Normalizr/package.json b/18 Normalizr/package.json
index d0cd2b6..b23c5b0 100644
--- a/18 Normalizr/package.json	
+++ b/18 Normalizr/package.json	
@@ -35,7 +35,7 @@
     "bootstrap": "^3.3.7",
     "jquery": "^3.1.1",
     "lc-form-validation": "^0.1.7",
-    "normalizr": "^2.3.1",
+    "normalizr": "^3.0.0",
     "react": "^15.3.2",
     "react-dom": "^15.3.2",
     "react-redux": "^4.4.5",
@@ -43,6 +43,7 @@
     "react-router-redux": "^4.0.6",
     "redux": "^3.6.0",
     "redux-thunk": "^2.1.0",
+    "reselect": "^2.5.4",
     "toastr": "^2.1.2",
     "validator": "^6.2.0"
   }
diff --git a/18 Normalizr/src/common/actionsEnums.ts b/18 Normalizr/src/common/actionsEnums.ts
index 145aa5c..7aa8180 100644
--- a/18 Normalizr/src/common/actionsEnums.ts	
+++ b/18 Normalizr/src/common/actionsEnums.ts	
@@ -3,8 +3,9 @@ export const actionsEnums = {
   USERPROFILE_PERFORM_LOGIN: "USERPROFILE_PERFORM_LOGIN",
   STUDENTS_GET_LIST_REQUEST_COMPLETED: "STUDENTS_GET_LIST_REQUEST_COMPLETED",
   STUDENT_GET_STUDENT_REQUEST_COMPLETED: "STUDENT_GET_STUDENT_REQUEST_COMPLETED",
-  STUDENT_FIELD_VALUE_CHANGED: "STUDENT_FIELD_VALUE_CHANGED",
   STUDENT_FIELD_VALUE_CHANGED_COMPLETED: "STUDENT_FIELD_VALUE_CHANGED_COMPLETED",
   STUDENT_SAVE_COMPLETED: "STUDENT_SAVE_COMPLETED",
-  RESET_EDITING_STUDENT: "RESET_EDITING_STUDENT"
+  RESET_EDITING_STUDENT: "RESET_EDITING_STUDENT",
+  FETCH_COUNTRY_LIST_REQUEST_COMPLETED: "FETCH_COUNTRY_LIST_REQUEST_COMPLETED",
+  ADD_COUNTRY: "ADD_COUNTRY",
 };
diff --git a/18 Normalizr/src/common/components/Input.tsx b/18 Normalizr/src/common/components/Input.tsx
index a0b55a4..2cc8c09 100644
--- a/18 Normalizr/src/common/components/Input.tsx	
+++ b/18 Normalizr/src/common/components/Input.tsx	
@@ -1,4 +1,5 @@
 import * as React from "react";
+import {ValidationFieldComponent} from './validationFieldComponent';
 
 interface Props {
   name: string;
@@ -10,37 +11,21 @@ interface Props {
   error?: string;
 }
 
-export class Input extends React.Component<Props, {}> {
-  constructor(props: Props) {
-    super(props);
-  }
-
-  public render() {
-    let wrapperClass: string = "form-group";
-    if (this.props.error && this.props.error.length > 0) {
-      wrapperClass += " " + "has-error";
-    }
-    return (
-      <div className={wrapperClass}>
-        <label htmlFor={this.props.name}>
-          {this.props.label}
-        </label>
-        <div className="field">
-          <input
-            type="text"
-            name={this.props.name}
-            className="form-control"
-            placeholder={this.props.placeholder}
-            ref={this.props.name}
-            value={this.props.value}
-            onChange={this.props.onChange}
-            onBlur={this.props.onBlur}
-          />
-          <div className="input">
-            {this.props.error}
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
+export const Input = (props: Props) => {
+  return (
+    <ValidationFieldComponent error={props.error}>
+      <label htmlFor={props.name}>
+        {props.label}
+      </label>
+      <input
+        type="text"
+        name={props.name}
+        className="form-control"
+        placeholder={props.placeholder}
+        value={props.value}
+        onChange={props.onChange}
+        onBlur={props.onBlur}
+      />
+    </ValidationFieldComponent>
+  );
+};
diff --git a/18 Normalizr/src/common/components/Select.tsx b/18 Normalizr/src/common/components/Select.tsx
new file mode 100644
index 0000000..bf39c7a
--- /dev/null
+++ b/18 Normalizr/src/common/components/Select.tsx	
@@ -0,0 +1,32 @@
+import * as React from "react";
+import {ValidationFieldComponent} from './validationFieldComponent';
+
+interface Props {
+  name: string;
+  label: string;
+  onChange: any;
+  onBlur?: any;
+  value: any;
+  error?: string;
+  options: any;
+}
+
+export const Select = (props: Props) => {
+
+  return (
+    <ValidationFieldComponent error={props.error}>
+      <label htmlFor={props.name}>
+        {props.label}
+      </label>
+      <select
+        name={props.name}
+        className="form-control"
+        value={props.value}
+        onChange={props.onChange}
+        onBlur={props.onBlur} >
+      {props.options}
+      </select>
+    </ValidationFieldComponent>
+
+  );
+}
diff --git a/18 Normalizr/src/common/components/index.ts b/18 Normalizr/src/common/components/index.ts
new file mode 100644
index 0000000..ebbe1ee
--- /dev/null
+++ b/18 Normalizr/src/common/components/index.ts	
@@ -0,0 +1,7 @@
+import {Input} from './Input';
+import {Select} from './Select';
+
+export {
+  Input,
+  Select
+}
diff --git a/18 Normalizr/src/common/components/validationFieldComponent.tsx b/18 Normalizr/src/common/components/validationFieldComponent.tsx
new file mode 100644
index 0000000..fc0be38
--- /dev/null
+++ b/18 Normalizr/src/common/components/validationFieldComponent.tsx	
@@ -0,0 +1,26 @@
+import * as React from "react";
+
+interface Props {
+  error?: string;
+}
+
+export class ValidationFieldComponent extends React.Component<Props, {}> {
+  constructor(props: Props) {
+    super(props);
+  }
+
+  public render() {
+    let wrapperClass: string = "form-group";
+    if (this.props.error && this.props.error.length > 0) {
+      wrapperClass += " has-error";
+    }
+    return (
+      <div className={wrapperClass}>
+        {this.props.children}
+        <div className="help-block">
+          {this.props.error}
+        </div>
+      </div>
+    );
+  }
+}
diff --git a/18 Normalizr/src/common/validations/validators.ts b/18 Normalizr/src/common/validations/required.ts
similarity index 67%
rename from 18 Normalizr/src/common/validations/validators.ts
rename to 18 Normalizr/src/common/validations/required.ts
index 232ee91..bb42dc8 100644
--- a/18 Normalizr/src/common/validations/validators.ts	
+++ b/18 Normalizr/src/common/validations/required.ts	
@@ -1,12 +1,12 @@
 import { FieldValidationResult } from "lc-form-validation";
+import { validationsEnums } from "../validationsEnums";
 
-// TODO: Harcoded strings and Id's isolate them in a config class
 export const requiredValidationHandler = (vm: any, value: any): FieldValidationResult => {
   const isFieldInformed: boolean = (value != null && value.length > 0);
-  const errorInfo: string = (isFieldInformed) ? "" : "Mandatory field";
+  const errorInfo: string = (isFieldInformed) ? "" : validationsEnums.REQUIRED.FIELD.MESSAGE;
 
   const fieldValidationResult: FieldValidationResult = new FieldValidationResult();
-  fieldValidationResult.type = "REQUIRED";
+  fieldValidationResult.type = validationsEnums.REQUIRED.FIELD.TYPE;
   fieldValidationResult.succeeded = isFieldInformed;
   fieldValidationResult.errorMessage = errorInfo;
 
diff --git a/18 Normalizr/src/common/validations/requiredId.ts b/18 Normalizr/src/common/validations/requiredId.ts
new file mode 100644
index 0000000..49010f0
--- /dev/null
+++ b/18 Normalizr/src/common/validations/requiredId.ts	
@@ -0,0 +1,14 @@
+import { FieldValidationResult } from "lc-form-validation";
+import { validationsEnums } from "../validationsEnums";
+
+export const requiredIdValidationHandler = (vm: any, value: {id: number}): FieldValidationResult => {
+  const isFieldInformed: boolean = (value != null && value.id && value.id > 0);
+  const errorInfo: string = (isFieldInformed) ? "" : validationsEnums.REQUIRED.FIELD.MESSAGE;
+
+  const fieldValidationResult: FieldValidationResult = new FieldValidationResult();
+  fieldValidationResult.type = validationsEnums.REQUIRED.FIELD.TYPE;
+  fieldValidationResult.succeeded = isFieldInformed;
+  fieldValidationResult.errorMessage = errorInfo;
+
+  return fieldValidationResult;
+};
diff --git a/18 Normalizr/src/common/validationsEnums.ts b/18 Normalizr/src/common/validationsEnums.ts
index 6cd9b08..6a4a2f6 100644
--- a/18 Normalizr/src/common/validationsEnums.ts	
+++ b/18 Normalizr/src/common/validationsEnums.ts	
@@ -1,4 +1,10 @@
 export const validationsEnums = {
+  REQUIRED: {
+    FIELD: {
+      TYPE: "REQUIRED_FIELD",
+      MESSAGE: "Mandatory field",
+    }
+  },
   EMAIL: {
     NOT_VALID: {
       TYPE: "EMAIL_NOT_VALID",
diff --git a/18 Normalizr/src/main.tsx b/18 Normalizr/src/main.tsx
index 4069e1a..84e5a4f 100644
--- a/18 Normalizr/src/main.tsx	
+++ b/18 Normalizr/src/main.tsx	
@@ -2,7 +2,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import { Router, Route, IndexRoute, hashHistory } from "react-router";
 import { syncHistoryWithStore} from "react-router-redux";
-import { createStore, applyMiddleware } from "redux";
+import { createStore, applyMiddleware, compose } from "redux";
 import { Provider } from "react-redux";
 import { reducers } from "./reducers";
 import { App } from "./app";
@@ -13,7 +13,10 @@ import reduxThunk from "redux-thunk";
 
 let store = createStore(
   reducers,
-  applyMiddleware(reduxThunk),
+  compose(
+    applyMiddleware(reduxThunk),
+    window['devToolsExtension'] ? window['devToolsExtension']() : f => f
+  )
 );
 
 const history = syncHistoryWithStore(hashHistory, store);
diff --git a/18 Normalizr/src/model/api/country.ts b/18 Normalizr/src/model/api/country.ts
new file mode 100644
index 0000000..3268dbb
--- /dev/null
+++ b/18 Normalizr/src/model/api/country.ts	
@@ -0,0 +1,9 @@
+export class Country {
+  id: number;
+  name: string;
+
+  constructor() {
+    this.id = -1;
+    this.name = "";
+  }
+}
diff --git a/18 Normalizr/src/model/api/student.ts b/18 Normalizr/src/model/api/student.ts
index ff99025..0208db3 100644
--- a/18 Normalizr/src/model/api/student.ts	
+++ b/18 Normalizr/src/model/api/student.ts	
@@ -3,12 +3,14 @@ export class Student {
   gotActiveTraining: boolean;
   fullname: string;
   email: string;
+  countryId: number;
 
   public constructor() {
     this.id = -1;
     this.gotActiveTraining = false;
     this.fullname = "";
     this.email = "";
+    this.countryId = -1;
   }
 }
 
diff --git a/18 Normalizr/src/model/mappers/countryMapper.ts b/18 Normalizr/src/model/mappers/countryMapper.ts
new file mode 100644
index 0000000..2d0ca1e
--- /dev/null
+++ b/18 Normalizr/src/model/mappers/countryMapper.ts	
@@ -0,0 +1,18 @@
+import { Country } from '../api/country';
+import { CountryView } from '../view/countryView';
+
+class CountryMapper {
+  mapCountryToCountryView(country: Country): CountryView {
+    return {
+      ...country
+    }
+  }
+
+  mapCountryListToCountryViewList(countrys: Country[]): CountryView[] {
+    return countrys.map((country) => {
+      return this.mapCountryToCountryView(country);
+    });
+  }
+}
+
+export const countryMapper = new CountryMapper();
diff --git a/18 Normalizr/src/model/mappers/studentMapper.ts b/18 Normalizr/src/model/mappers/studentMapper.ts
index 1e8226b..db1926e 100644
--- a/18 Normalizr/src/model/mappers/studentMapper.ts	
+++ b/18 Normalizr/src/model/mappers/studentMapper.ts	
@@ -7,13 +7,17 @@ class StudentMapper {
       id: student.id,
       gotActiveTraining: student.gotActiveTraining,
       fullname: student.fullname,
-      email: student.email
-    }
+      email: student.email,
+      country: {
+        id: student.countryId,
+        name: '',
+      },
+    };
   }
 
   mapStudentListToStudentViewList(students: Student[]): StudentView[] {
     return students.map((student) => {
-      return this.mapStudentToStudentView(student)
+      return this.mapStudentToStudentView(student);
     });
   }
 }
diff --git a/18 Normalizr/src/model/view/countryView.ts b/18 Normalizr/src/model/view/countryView.ts
new file mode 100644
index 0000000..53e3784
--- /dev/null
+++ b/18 Normalizr/src/model/view/countryView.ts	
@@ -0,0 +1,9 @@
+export class CountryView {
+  id: number;
+  name: string;
+
+  constructor() {
+    this.id = -1;
+    this.name = "";
+  }
+}
diff --git a/18 Normalizr/src/model/view/studentErrors.ts b/18 Normalizr/src/model/view/studentErrors.ts
index f1a5ef0..5e9b888 100644
--- a/18 Normalizr/src/model/view/studentErrors.ts	
+++ b/18 Normalizr/src/model/view/studentErrors.ts	
@@ -3,4 +3,5 @@ import { FieldValidationResult } from "lc-form-validation";
 export class StudentErrors {
   fullname: FieldValidationResult;
   email: FieldValidationResult;
+  country: FieldValidationResult;
 }
diff --git a/18 Normalizr/src/model/view/studentView.ts b/18 Normalizr/src/model/view/studentView.ts
index 426d1b4..212b1e7 100644
--- a/18 Normalizr/src/model/view/studentView.ts	
+++ b/18 Normalizr/src/model/view/studentView.ts	
@@ -1,13 +1,17 @@
+import { CountryView } from './countryView';
+
 export class StudentView {
   id: number;
   gotActiveTraining: boolean;
   fullname: string;
   email: string;
+  country: CountryView;
 
   public constructor() {
     this.id = -1;
     this.gotActiveTraining = false;
     this.fullname = "";
     this.email = "";
+    this.country = new CountryView();
   }
 }
diff --git a/18 Normalizr/src/pages/login/login.validation.ts b/18 Normalizr/src/pages/login/login.validation.ts
index 0b1c48d..6ed6dd5 100644
--- a/18 Normalizr/src/pages/login/login.validation.ts	
+++ b/18 Normalizr/src/pages/login/login.validation.ts	
@@ -1,5 +1,5 @@
 import { FieldValidationResult, BaseFormValidation } from "lc-form-validation";
-import { requiredValidationHandler } from "../../common/validations/validators";
+import { requiredValidationHandler } from "../../common/validations/required";
 import { emailValidationHandler } from "../../common/validations/email";
 
 class LoginFormValidation extends BaseFormValidation {
diff --git a/18 Normalizr/src/pages/login/loginContainer.tsx b/18 Normalizr/src/pages/login/loginContainer.tsx
index b78492f..9ec0310 100644
--- a/18 Normalizr/src/pages/login/loginContainer.tsx	
+++ b/18 Normalizr/src/pages/login/loginContainer.tsx	
@@ -3,8 +3,9 @@ import { LoginComponent } from './login';
 import { LoginEntity } from '../../model/view/login';
 import { updateEditingLogin } from './actions/updateEditingLogin';
 import { loginRequestStartedAction} from './actions/loginRequestStarted';
+import {State} from '../../reducers';
 
-const mapStateToProps = (state) => {
+const mapStateToProps = (state: State) => {
     return {
       loginInfo: state.sessionReducer.editingLogin
     }
diff --git a/18 Normalizr/src/pages/student-detail/actions/addCountry.ts b/18 Normalizr/src/pages/student-detail/actions/addCountry.ts
new file mode 100644
index 0000000..fff39d8
--- /dev/null
+++ b/18 Normalizr/src/pages/student-detail/actions/addCountry.ts	
@@ -0,0 +1,11 @@
+import { actionsEnums } from "../../../common/actionsEnums";
+import {CountryView} from '../../../model/view/countryView';
+import {normalize} from 'normalizr';
+import {countrySchema} from '../../../schemas';
+
+export const addCountryAction = (country: CountryView) => {
+  return {
+    type: actionsEnums.ADD_COUNTRY,
+    payload: normalize(country, countrySchema)
+  };
+};
diff --git a/18 Normalizr/src/pages/student-detail/actions/getStudentRequestStart.ts b/18 Normalizr/src/pages/student-detail/actions/getStudentRequestStart.ts
index d3175ce..03386ca 100644
--- a/18 Normalizr/src/pages/student-detail/actions/getStudentRequestStart.ts	
+++ b/18 Normalizr/src/pages/student-detail/actions/getStudentRequestStart.ts	
@@ -1,8 +1,6 @@
 import { actionsEnums } from "../../../common/actionsEnums";
 import { studentApi } from "../../../rest-api/student-api";
 import { getStudentRequestCompletedAction } from "./getStudentRequestCompleted";
-import { normalize } from 'normalizr'
-import { studentSchema } from '../../../schema/schema'
 
 export const getStudentRequestStartAction = (studentId: number) => {
   return function(dispatcher) {
@@ -10,11 +8,6 @@ export const getStudentRequestStartAction = (studentId: number) => {
 
     promise.then(
       data => {
-        console.log(
-          'normalized response',
-          normalize(data, studentSchema)
-        );
-
         dispatcher(getStudentRequestCompletedAction(data));
       }
     );
diff --git a/18 Normalizr/src/pages/student-detail/actions/studentFieldValueChangedStart.ts b/18 Normalizr/src/pages/student-detail/actions/studentFieldValueChangedStart.ts
index 85713a7..1d2d3d6 100644
--- a/18 Normalizr/src/pages/student-detail/actions/studentFieldValueChangedStart.ts	
+++ b/18 Normalizr/src/pages/student-detail/actions/studentFieldValueChangedStart.ts	
@@ -1,11 +1,11 @@
 import { studentFieldValueChangedCompleted } from "./studentFieldValueChangedCompleted";
 import { FieldValidationResult } from "lc-form-validation";
-import { loginFormValidation} from "../../login/login.validation";
+import { studentFormValidation} from "../student.validation";
 
 export function studentFieldValueChangedStart(viewModel: any, fieldName: string, value: any, event?: any) {
 
   return (dispatcher) => {
-    loginFormValidation.validateField(viewModel, fieldName, value, event).then(
+    studentFormValidation.validateField(viewModel, fieldName, value, event).then(
       (fieldValidationResult: FieldValidationResult) => dispatcher(studentFieldValueChangedCompleted(fieldName, value, fieldValidationResult ))
     );
   };
diff --git a/18 Normalizr/src/pages/student-detail/components/studentForm.tsx b/18 Normalizr/src/pages/student-detail/components/studentForm.tsx
index adad834..09a5754 100644
--- a/18 Normalizr/src/pages/student-detail/components/studentForm.tsx	
+++ b/18 Normalizr/src/pages/student-detail/components/studentForm.tsx	
@@ -1,13 +1,15 @@
-import * as React from "react";
-import { Input } from "../../../common/components/Input";
-import { StudentView } from "../../../model/view/studentView";
-import { StudentErrors } from "../../../model/view/studentErrors";
+import * as React from 'react';
+import { Input, Select } from '../../../common/components/';
+import { StudentView } from '../../../model/view/studentView';
+import { StudentErrors } from '../../../model/view/studentErrors';
+import { CountryView } from '../../../model/view/countryView';
 
 interface Props {
   student: StudentView;
   errors: StudentErrors;
   fireFieldValueChanged: (viewModel: any, fieldName: string, value: any, filter?: any) => void;
   saveStudent: (student: StudentView) => void;
+  countries: CountryView[];
 }
 
 export const StudentForm = (props: Props) => {
@@ -24,6 +26,11 @@ export const StudentForm = (props: Props) => {
     props.saveStudent(props.student);
   };
 
+  const onSelectCountry = (event, value) => {
+    let field = event.target.name;
+
+    props.fireFieldValueChanged(props.student.country, field, value);
+  };
 
   return (
     <form>
@@ -31,20 +38,32 @@ export const StudentForm = (props: Props) => {
 
       <Input
         name="fullname"
-        label="full name"
+        label="Full name"
         value={props.student.fullname}
-        onChange={updateStudentFromUI.bind(this)}
+        onChange={updateStudentFromUI}
         error={(props.errors.fullname) ? props.errors.fullname.errorMessage : ""}
       />
 
       <Input
         name="email"
-        label="email"
+        label="Email"
         value={props.student.email}
-        onChange={updateStudentFromUI.bind(this)}
+        onChange={updateStudentFromUI}
         error={(props.errors.email) ? props.errors.email.errorMessage : ""}
       />
 
+      <Select
+        name="country"
+        label="Country"
+        value={props.student.country.id}
+        onChange={(e: any) => onSelectCountry(e, {id: e.target.value})}
+        error={(props.errors.country) ? props.errors.country.errorMessage : ""}
+        options={
+          props.countries.map((country) =>
+            <option key={country.id} value={country.id}>{country.name}</option>
+          )
+        } />
+
       <button type="submit" className="btn btn-default" onClick={onSave.bind(this)}>
         Save
       </button>
diff --git a/18 Normalizr/src/pages/student-detail/student.validation.ts b/18 Normalizr/src/pages/student-detail/student.validation.ts
index 1b3ae1d..908e293 100644
--- a/18 Normalizr/src/pages/student-detail/student.validation.ts	
+++ b/18 Normalizr/src/pages/student-detail/student.validation.ts	
@@ -1,6 +1,7 @@
 import { FieldValidationResult, BaseFormValidation } from "lc-form-validation";
-import { requiredValidationHandler } from "../../common/validations/validators";
+import { requiredValidationHandler } from "../../common/validations/required";
 import { emailValidationHandler } from "../../common/validations/email";
+import { requiredIdValidationHandler } from '../../common/validations/requiredId';
 
 class StudentFormValidation extends BaseFormValidation {
 
@@ -9,7 +10,8 @@ class StudentFormValidation extends BaseFormValidation {
 
     this._validationEngine.initialize([
       { formFieldName: "fullname", vmFieldName: "fullname" },
-      { formFieldName: "email", vmFieldName: "email" }
+      { formFieldName: "email", vmFieldName: "email" },
+      { formFieldName: "country", vmFieldName: "country" }
     ]);
 
     this._validationEngine.addFieldValidation(
@@ -26,6 +28,11 @@ class StudentFormValidation extends BaseFormValidation {
       "email",
       emailValidationHandler,
     );
+
+    this._validationEngine.addFieldValidation(
+      "country",
+      requiredIdValidationHandler,
+    );
   }
 }
 
diff --git a/18 Normalizr/src/pages/student-detail/studentDetail.tsx b/18 Normalizr/src/pages/student-detail/studentDetail.tsx
index 075edd6..5f7f975 100644
--- a/18 Normalizr/src/pages/student-detail/studentDetail.tsx	
+++ b/18 Normalizr/src/pages/student-detail/studentDetail.tsx	
@@ -2,6 +2,7 @@ import * as React from "react";
 import { StudentView } from "../../model/view/studentView";
 import { StudentForm } from "./components/studentForm";
 import { StudentErrors } from "../../model/view/studentErrors";
+import { CountryView } from '../../model/view/countryView';
 
 interface Props  {
   params?: any;
@@ -11,6 +12,8 @@ interface Props  {
   fireFieldValueChanged: (viewModel: any, fieldName: string, value: any, filter?: any) => void;
   saveStudent: (student: StudentView) => void;
   resetStudent: () => void;
+  countries: CountryView[];
+  addInvalidCountryEntry: (country: CountryView) => void;
 }
 
 export class StudentDetailComponent extends React.Component<Props, {}> {
@@ -21,6 +24,8 @@ export class StudentDetailComponent extends React.Component<Props, {}> {
     } else {
       this.props.resetStudent();
     }
+
+    this.props.addInvalidCountryEntry({ id: 0, name: "Select country..." });
   }
 
   render() {
@@ -33,6 +38,7 @@ export class StudentDetailComponent extends React.Component<Props, {}> {
         fireFieldValueChanged={this.props.fireFieldValueChanged}
         saveStudent={this.props.saveStudent}
         errors={this.props.errors}
+        countries={this.props.countries}
       />
     );
   }
diff --git a/18 Normalizr/src/pages/student-detail/studentDetailContainer.tsx b/18 Normalizr/src/pages/student-detail/studentDetailContainer.tsx
index 4a4d08d..94aa55d 100644
--- a/18 Normalizr/src/pages/student-detail/studentDetailContainer.tsx	
+++ b/18 Normalizr/src/pages/student-detail/studentDetailContainer.tsx	
@@ -5,11 +5,16 @@ import { studentFieldValueChangedStart } from "./actions/studentFieldValueChange
 import { studentSaveRequestStart } from "./actions/studentSaveRequestStart";
 import { resetStudentAction } from './actions/resetStudent';
 import { StudentView } from "../../model/view/studentView";
+import { getCountries } from '../../reducers/domain/country/selectors';
+import {addCountryAction} from '../student-detail/actions/addCountry';
+import {CountryView} from '../../model/view/countryView';
+import {State} from '../../reducers';
 
-const mapStateToProps = (state) => {
+const mapStateToProps = (state: State) => {
   return {
     student: state.studentDomain.edit.editingStudent,
     errors: state.studentDomain.edit.editingStudentErrors,
+    countries: getCountries(state)
   };
 };
 
@@ -22,7 +27,8 @@ const mapDispatchToProps = (dispatch) => {
       fieldName: string,
       value: any) => dispatch(studentFieldValueChangedStart(viewModel, fieldName, value)
     ),
-    resetStudent: () => dispatch(resetStudentAction())
+    resetStudent: () => dispatch(resetStudentAction()),
+    addInvalidCountryEntry: (country:CountryView) => dispatch(addCountryAction(country))
   };
 };
 
diff --git a/18 Normalizr/src/pages/student-list/actions/fetchCountryList.ts b/18 Normalizr/src/pages/student-list/actions/fetchCountryList.ts
new file mode 100644
index 0000000..8f98101
--- /dev/null
+++ b/18 Normalizr/src/pages/student-list/actions/fetchCountryList.ts	
@@ -0,0 +1,23 @@
+import { normalize } from 'normalizr';
+import { actionsEnums } from '../../../common/actionsEnums';
+import { countryApi } from '../../../rest-api/country-api';
+import {countryArraySchema} from '../../../schemas';
+import {CountryView} from '../../../model/view/countryView';
+
+export const fetchCountryListRequestStartedAction = () => (dispatcher) => {
+  const promise = countryApi.fetchCountries();
+
+  promise.then(
+    data => {
+      const normalizedCountries = normalize(data, countryArraySchema);
+      dispatcher(fetchCountryListRequestCompletedAction(normalizedCountries));
+    }
+  );
+
+  return promise;
+}
+
+export const fetchCountryListRequestCompletedAction = (countries) => ({
+  type: actionsEnums.FETCH_COUNTRY_LIST_REQUEST_COMPLETED,
+  payload: countries
+});
diff --git a/18 Normalizr/src/pages/student-list/actions/studentListRequestStarted.ts b/18 Normalizr/src/pages/student-list/actions/studentListRequestStarted.ts
index 58955e4..f6ebc97 100644
--- a/18 Normalizr/src/pages/student-list/actions/studentListRequestStarted.ts	
+++ b/18 Normalizr/src/pages/student-list/actions/studentListRequestStarted.ts	
@@ -1,8 +1,8 @@
 import { actionsEnums } from "../../../common/actionsEnums";
 import { studentApi } from "../../../rest-api/student-api";
 import { studentListRequestCompletedAction } from "./studentListRequestCompleted";
-import { normalize } from 'normalizr'
-import { arrayOfStudentsSchema } from '../../../schema/schema'
+import { normalize } from 'normalizr';
+import { studentArraySchema } from '../../../schemas';
 
 export const studentListRequestStartedAction = () => {
   return function(dispatcher) {
@@ -10,7 +10,7 @@ export const studentListRequestStartedAction = () => {
 
     promise.then(
       data => {
-        const normalizedResult = normalize(data, arrayOfStudentsSchema);
+        const normalizedResult = normalize(data, studentArraySchema);
         dispatcher(studentListRequestCompletedAction(normalizedResult));
       }
     );
diff --git a/18 Normalizr/src/pages/student-list/components/studentHeader.tsx b/18 Normalizr/src/pages/student-list/components/studentHeader.tsx
index 17fdade..99b67fe 100644
--- a/18 Normalizr/src/pages/student-list/components/studentHeader.tsx	
+++ b/18 Normalizr/src/pages/student-list/components/studentHeader.tsx	
@@ -7,6 +7,7 @@ export const StudentHeaderComponent = () => {
         <th>Active Training</th>
         <th>Name</th>
         <th>Email</th>
+        <th>Country</th>
         <th>Commands</th>
       </tr>
     </thead>
diff --git a/18 Normalizr/src/pages/student-list/components/studentRow.tsx b/18 Normalizr/src/pages/student-list/components/studentRow.tsx
index cf6d39d..2cb2ebe 100644
--- a/18 Normalizr/src/pages/student-list/components/studentRow.tsx	
+++ b/18 Normalizr/src/pages/student-list/components/studentRow.tsx	
@@ -7,6 +7,13 @@ interface Props {
 }
 
 export const StudentRowComponent = (props: Props) => {
+
+  const getCountryName = () => {
+    return props.student.country.id ?
+      props.student.country.name:
+      "";
+  };
+
   return (
     <tr>
       <td>
@@ -24,6 +31,9 @@ export const StudentRowComponent = (props: Props) => {
       <td>
         <span>{props.student.email}</span>
       </td>
+      <td>
+        <span>{getCountryName()}</span>
+      </td>
       <td>
         <span className="btn btn-link btn-xs" onClick={(e) => props.editStudent(props.student.id)}>
           <span className="glyphicon glyphicon-pencil" aria-hidden="true" />
diff --git a/18 Normalizr/src/pages/student-list/studentList.tsx b/18 Normalizr/src/pages/student-list/studentList.tsx
index db239d1..8894483 100644
--- a/18 Normalizr/src/pages/student-list/studentList.tsx	
+++ b/18 Normalizr/src/pages/student-list/studentList.tsx	
@@ -8,13 +8,13 @@ interface Props {
   getStudentList: () => void;
   editStudent: (id: number) => void;
   navigateToAddNewStudent: () => void;
+  fetchCountryList: () => void;
 }
 
-
 export class StudentListComponent extends React.Component<Props, {}> {
-
   componentDidMount() {
     this.props.getStudentList();
+    this.props.fetchCountryList();
   }
 
   render() {
diff --git a/18 Normalizr/src/pages/student-list/studentListContainer.tsx b/18 Normalizr/src/pages/student-list/studentListContainer.tsx
index 694efd0..1600331 100644
--- a/18 Normalizr/src/pages/student-list/studentListContainer.tsx	
+++ b/18 Normalizr/src/pages/student-list/studentListContainer.tsx	
@@ -2,11 +2,13 @@ import { connect } from "react-redux";
 import { studentListRequestStartedAction } from "./actions/studentListRequestStarted";
 import { StudentListComponent } from "./studentList";
 import { navigateToEditStudentAction, navigateToNewStudentAction } from "./actions/navigateToEditStudent";
-import { getStudents } from '../../reducers'
+import { getStudents } from '../../reducers/domain/student/selectors';
+import { fetchCountryListRequestStartedAction } from './actions/fetchCountryList';
+import {State} from '../../reducers';
 
-const mapStateToProps = (state) => {
+const mapStateToProps = (state: State) => {
   return {
-    studentList: getStudents(state),
+    studentList: getStudents(state)
   };
 };
 
@@ -14,7 +16,8 @@ const mapDispatchToProps = (dispatch) => {
   return {
     getStudentList: () => dispatch(studentListRequestStartedAction()),
     editStudent: (id: number) => dispatch(navigateToEditStudentAction(id)),
-    navigateToAddNewStudent: () => dispatch(navigateToNewStudentAction())
+    navigateToAddNewStudent: () => dispatch(navigateToNewStudentAction()),
+    fetchCountryList: () => dispatch(fetchCountryListRequestStartedAction())
   };
 };
 
diff --git a/18 Normalizr/src/reducers/domain/country/byId.ts b/18 Normalizr/src/reducers/domain/country/byId.ts
new file mode 100644
index 0000000..122ef36
--- /dev/null
+++ b/18 Normalizr/src/reducers/domain/country/byId.ts	
@@ -0,0 +1,12 @@
+import { CountryView } from '../../../model/view/countryView';
+
+export const byId = (state: {[id: number]: CountryView} = {}, action) => {
+  if (action.payload && action.payload.entities) {
+    return {
+      ...state,
+      ...action.payload.entities.countries
+    }
+  }
+
+  return state;
+}
diff --git a/18 Normalizr/src/reducers/domain/country/index.ts b/18 Normalizr/src/reducers/domain/country/index.ts
new file mode 100644
index 0000000..d1d0a89
--- /dev/null
+++ b/18 Normalizr/src/reducers/domain/country/index.ts	
@@ -0,0 +1,14 @@
+import { combineReducers } from 'redux';
+import {byId} from './byId';
+import {allIds} from './list';
+import { CountryView } from '../../../model/view/countryView';
+
+export interface CountryDomain {
+  byId: {[id: number]: CountryView};
+  allIds: number[];
+}
+
+export const countryDomain = combineReducers<CountryDomain>({
+  byId,
+  allIds
+});
diff --git a/18 Normalizr/src/reducers/domain/country/list.ts b/18 Normalizr/src/reducers/domain/country/list.ts
new file mode 100644
index 0000000..8f5e173
--- /dev/null
+++ b/18 Normalizr/src/reducers/domain/country/list.ts	
@@ -0,0 +1,13 @@
+import { actionsEnums } from '../../../common/actionsEnums';
+
+export const allIds = (state: number[] = [], action) => {
+  switch (action.type) {
+    case actionsEnums.FETCH_COUNTRY_LIST_REQUEST_COMPLETED:
+      return action.payload.result;
+
+    case actionsEnums.ADD_COUNTRY:
+      return [...state, action.payload.result];
+  }
+
+  return state;
+}
diff --git a/18 Normalizr/src/reducers/domain/country/selectors/index.ts b/18 Normalizr/src/reducers/domain/country/selectors/index.ts
new file mode 100644
index 0000000..efbc265
--- /dev/null
+++ b/18 Normalizr/src/reducers/domain/country/selectors/index.ts	
@@ -0,0 +1,14 @@
+import {createSelector} from 'reselect';
+import {State} from '../../../index';
+import {CountryDomain} from '../index';
+
+export const countryDomain = (state: State) => state.countryDomain;
+
+export const getCountries = createSelector(
+  countryDomain,
+  (state: CountryDomain) => state.allIds.map(id => getCountry(state, id))
+);
+
+export const getCountry = (state: CountryDomain, id) => ({
+  ...state.byId[id]
+});
diff --git a/18 Normalizr/src/reducers/domain/student/byId.ts b/18 Normalizr/src/reducers/domain/student/byId.ts
new file mode 100644
index 0000000..2e15ca3
--- /dev/null
+++ b/18 Normalizr/src/reducers/domain/student/byId.ts	
@@ -0,0 +1,11 @@
+import { StudentView } from "../../../model/view/studentView";
+
+export const byId = (state : {[id: number] : StudentView} = {}, action) => {
+  if (action.payload && action.payload.entities) {
+    return {
+      ...state,
+      ...action.payload.entities.students
+    }
+  }
+  return state;
+}
diff --git a/18 Normalizr/src/reducers/domain/student/edit.ts b/18 Normalizr/src/reducers/domain/student/edit.ts
index 15540ee..eb1aa86 100644
--- a/18 Normalizr/src/reducers/domain/student/edit.ts	
+++ b/18 Normalizr/src/reducers/domain/student/edit.ts	
@@ -3,7 +3,7 @@ import { StudentView } from "../../../model/view/studentView";
 import { StudentErrors } from "../../../model/view/studentErrors";
 import { IStudentFieldValueChangedCompletedPayload } from "../../../pages/student-detail/actions/studentFieldValueChangedCompleted";
 
-class EditState  {
+export class EditState  {
   editingStudent: StudentView;
   editingStudentErrors: StudentErrors;
 
diff --git a/18 Normalizr/src/reducers/domain/student/index.ts b/18 Normalizr/src/reducers/domain/student/index.ts
index b61414a..dbedc3e 100644
--- a/18 Normalizr/src/reducers/domain/student/index.ts	
+++ b/18 Normalizr/src/reducers/domain/student/index.ts	
@@ -1,13 +1,17 @@
 import { combineReducers } from 'redux';
-import { byId, allIds} from './list';
-import { edit } from './edit'
+import {byId} from './byId';
+import {allIds} from './list';
+import { edit, EditState } from './edit';
 import { StudentView } from '../../../model/view/studentView';
 
-export const studentDomain = combineReducers({
+export interface StudentDomain {
+  byId: {[id: number] : StudentView},
+  allIds: number[];
+  edit: EditState;
+};
+
+export const studentDomain = combineReducers<StudentDomain>({
   byId,
   allIds,
   edit
 });
-
-export const getStudent = (state, id) : StudentView => state[id];
-export const getIds = (state) => state;
diff --git a/18 Normalizr/src/reducers/domain/student/list.ts b/18 Normalizr/src/reducers/domain/student/list.ts
index 2315c6a..7f0d2c3 100644
--- a/18 Normalizr/src/reducers/domain/student/list.ts	
+++ b/18 Normalizr/src/reducers/domain/student/list.ts	
@@ -1,17 +1,4 @@
-
 import { actionsEnums } from "../../../common/actionsEnums";
-import { StudentView } from "../../../model/view/studentView";
-import { StudentErrors } from "../../../model/view/studentErrors";
-
-export const byId = (state : {[id: number] : StudentView} = {}, action) => {
-  if (action.payload && action.payload.entities) {
-    return {
-      ...state,
-      ...action.payload.entities.students
-    }
-  }
-  return state;
-}
 
 export const allIds =  (state: Number[] = [], action) => {
   switch (action.type) {
diff --git a/18 Normalizr/src/reducers/domain/student/selectors/index.ts b/18 Normalizr/src/reducers/domain/student/selectors/index.ts
new file mode 100644
index 0000000..a7a3329
--- /dev/null
+++ b/18 Normalizr/src/reducers/domain/student/selectors/index.ts	
@@ -0,0 +1,20 @@
+import {createSelector} from 'reselect';
+import {State} from '../../../index';
+import {StudentDomain} from '../index';
+import {StudentView} from '../../../../model/view/studentView';
+import {CountryDomain} from '../../country';
+import {countryDomain, getCountry} from '../../country/selectors';
+
+const studentDomain = (state: State) => state.studentDomain;
+
+export const getStudents = createSelector(
+  studentDomain,
+  countryDomain,
+  (studentDomain: StudentDomain, countryDomain: CountryDomain) =>
+    studentDomain.allIds.map(id => getStudent(studentDomain, countryDomain, id))
+);
+
+const getStudent = (studentDomain: StudentDomain, countryDomain: CountryDomain, id): StudentView => ({
+  ...studentDomain.byId[id],
+  country: getCountry(countryDomain, studentDomain.byId[id].country)
+});
diff --git a/18 Normalizr/src/reducers/index.ts b/18 Normalizr/src/reducers/index.ts
index f2312d6..c105468 100644
--- a/18 Normalizr/src/reducers/index.ts	
+++ b/18 Normalizr/src/reducers/index.ts	
@@ -1,17 +1,19 @@
-import { combineReducers } from "redux";
-import { sessionReducer } from "./logic/session";
-import { studentDomain, getStudent, getIds } from "./domain/student";
-import { routerReducer } from "react-router-redux";
-import { StudentView } from '../model/view/studentView'
+import { combineReducers } from 'redux';
+import { routerReducer } from 'react-router-redux';
+import { sessionReducer, SessionState } from './logic/session';
+import { studentDomain, StudentDomain } from './domain/student';
+import { StudentView } from '../model/view/studentView';
+import { countryDomain, CountryDomain } from './domain/country';
 
-export const reducers =  combineReducers({
+export interface State {
+  studentDomain: StudentDomain;
+  countryDomain: CountryDomain;
+  sessionReducer: SessionState;
+  routing: any;
+}
+export const reducers =  combineReducers<State>({
   studentDomain,
+  countryDomain,
   sessionReducer,
-  routing: routerReducer
+  routing: routerReducer,
 });
-
-export const getStudents = (state) : StudentView[] => {
-  const ids = getIds(state.studentDomain.allIds);
-
-  return ids.map(id => getStudent(state.studentDomain.byId, id))
-}
diff --git a/18 Normalizr/src/reducers/logic/session.ts b/18 Normalizr/src/reducers/logic/session.ts
index 495ac38..27937fe 100644
--- a/18 Normalizr/src/reducers/logic/session.ts	
+++ b/18 Normalizr/src/reducers/logic/session.ts	
@@ -3,7 +3,7 @@ import {UserProfile} from '../../model/view/userProfile';
 import {LoginResponse} from '../../model/view/loginResponse';
 import {LoginEntity} from '../../model/view/login';
 
-class SessionState  {
+export class SessionState  {
   isUserLoggedIn : boolean;
   userProfile : UserProfile;
   editingLogin : LoginEntity;
diff --git a/18 Normalizr/src/rest-api/country-api.ts b/18 Normalizr/src/rest-api/country-api.ts
new file mode 100644
index 0000000..ba21c02
--- /dev/null
+++ b/18 Normalizr/src/rest-api/country-api.ts	
@@ -0,0 +1,21 @@
+import { Country } from '../model/api/country';
+import { CountryView } from '../model/view/countryView';
+import { countriesMockData } from './mock-data';
+import { countryMapper } from '../model/mappers/countryMapper';
+
+class CountryApi {
+  countriesData: Country[];
+
+  constructor() {
+    this.countriesData = countriesMockData;
+  }
+
+  fetchCountries(): Promise<CountryView[]> {
+    const countryViewList = countryMapper
+      .mapCountryListToCountryViewList(this.countriesData);
+
+    return Promise.resolve(countryViewList);
+  }
+}
+
+export const countryApi = new CountryApi();
diff --git a/18 Normalizr/src/rest-api/mock-data.ts b/18 Normalizr/src/rest-api/mock-data.ts
index 6f29571..54e6e5e 100644
--- a/18 Normalizr/src/rest-api/mock-data.ts	
+++ b/18 Normalizr/src/rest-api/mock-data.ts	
@@ -1,8 +1,16 @@
-import { Student } from "../model/api/student";
+import { Student } from '../model/api/student';
+import { Country } from '../model/api/country';
 
 export const studentsMockData: Student[] = [
-  {id: 1, gotActiveTraining: true, fullname: "John Doe", email: "test@fakeemail.com"},
-  {id: 2, gotActiveTraining: false, fullname: "Mike Huff", email: "mark@fakeemail.com"},
-  {id: 3, gotActiveTraining: true, fullname: "Harry Poe", email: "harry@fakeemail.com"},
-  {id: 4, gotActiveTraining: true, fullname: "Mary Joe", email: "mary@fakeemail.com"}
+  {id: 1, gotActiveTraining: true, fullname: "John Doe", email: "test@fakeemail.com", countryId: 1},
+  {id: 2, gotActiveTraining: false, fullname: "Mike Huff", email: "mark@fakeemail.com", countryId: 2},
+  {id: 3, gotActiveTraining: true, fullname: "Harry Poe", email: "harry@fakeemail.com", countryId: 0 },
+  {id: 4, gotActiveTraining: true, fullname: "Mary Joe", email: "mary@fakeemail.com", countryId: 0}
 ];
+
+export const countriesMockData: Country[] = [
+  { id: 1, name: "Spain" },
+  { id: 2, name: "Italy" },
+  { id: 3, name: "Germany" },
+  { id: 4, name: "France" }
+]
diff --git a/18 Normalizr/src/rest-api/student-api.ts b/18 Normalizr/src/rest-api/student-api.ts
index 5d88cdf..7fe412f 100644
--- a/18 Normalizr/src/rest-api/student-api.ts	
+++ b/18 Normalizr/src/rest-api/student-api.ts	
@@ -13,9 +13,10 @@ class StudentApi {
   }
 
   loadStudentList(): Promise<StudentView[]> {
-    const studentView = studentMapper.mapStudentListToStudentViewList(this.studentsData);
+    const studentViewList = studentMapper
+      .mapStudentListToStudentViewList(this.studentsData);
 
-    return Promise.resolve(studentView);
+    return Promise.resolve(studentViewList);
   }
 
   getStudentById(id: number): Promise<StudentView> {
@@ -30,7 +31,8 @@ class StudentApi {
       id: studentView.id,
       gotActiveTraining: studentView.gotActiveTraining,
       fullname: studentView.fullname,
-      email: studentView.email
+      email: studentView.email,
+      countryId: studentView.country.id
     };
 
     if (student.id > 0) {
diff --git a/18 Normalizr/src/schema/schema.ts b/18 Normalizr/src/schema/schema.ts
deleted file mode 100644
index 44463b7..0000000
--- a/18 Normalizr/src/schema/schema.ts	
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Schema, arrayOf} from 'normalizr'
-
-export const studentSchema = new Schema('students');
-export const arrayOfStudentsSchema = arrayOf(studentSchema);
diff --git a/18 Normalizr/src/schemas/country.ts b/18 Normalizr/src/schemas/country.ts
new file mode 100644
index 0000000..3913646
--- /dev/null
+++ b/18 Normalizr/src/schemas/country.ts	
@@ -0,0 +1,4 @@
+import { schema } from 'normalizr';
+
+export const countrySchema = new schema.Entity('countries');
+export const countryArraySchema = [countrySchema];
diff --git a/18 Normalizr/src/schemas/index.ts b/18 Normalizr/src/schemas/index.ts
new file mode 100644
index 0000000..1a346da
--- /dev/null
+++ b/18 Normalizr/src/schemas/index.ts	
@@ -0,0 +1,9 @@
+import {studentSchema, studentArraySchema} from './student';
+import {countrySchema, countryArraySchema} from './country';
+
+export {
+  studentSchema,
+  studentArraySchema,
+  countrySchema,
+  countryArraySchema,
+}
diff --git a/18 Normalizr/src/schemas/student.ts b/18 Normalizr/src/schemas/student.ts
new file mode 100644
index 0000000..4c7af65
--- /dev/null
+++ b/18 Normalizr/src/schemas/student.ts	
@@ -0,0 +1,7 @@
+import {schema} from 'normalizr';
+import {countrySchema} from './country';
+
+export const studentSchema = new schema.Entity('students', {
+  country: countrySchema
+});
+export const studentArraySchema = [studentSchema];