diff --git a/Sevomin.Models/Parameter.cs b/Sevomin.Models/Parameter.cs
index 9b3a2f2..dc0900a 100644
--- a/Sevomin.Models/Parameter.cs
+++ b/Sevomin.Models/Parameter.cs
@@ -37,11 +37,11 @@ namespace Sevomin.Models
         public string ParameterValueId { get; set; }
 
         [NotMapped]
-        public ICollection<ParameterValue> ParameterValues
+        public IQueryable<ParameterValue> ParameterValues
         {
             get
             {
-                return SevominDbContext.Current.ParameterValues.Where(x => x.GroupKey == ParameterValueId).ToList();
+                return SevominDbContext.Current.ParameterValues.Where(x => x.GroupKey == ParameterValueId);
             }
         }
 
diff --git a/Sevomin.Models/ParameterValue.cs b/Sevomin.Models/ParameterValue.cs
index 1bcc267..53ec4a7 100644
--- a/Sevomin.Models/ParameterValue.cs
+++ b/Sevomin.Models/ParameterValue.cs
@@ -22,5 +22,8 @@ namespace Sevomin.Models
         [Column(Order = 2)]
         [StringLength(50)]
         public string Value { get; set; }
+
+        [Required]
+        public decimal NumbericValue { get; set; }
     }
 }
diff --git a/Sevomin.Models/Sevomin.Models.csproj b/Sevomin.Models/Sevomin.Models.csproj
index a964d3d..76ed9b5 100644
--- a/Sevomin.Models/Sevomin.Models.csproj
+++ b/Sevomin.Models/Sevomin.Models.csproj
@@ -67,6 +67,7 @@
     <Compile Include="Helpers\SevominUserValidator.cs" />
     <Compile Include="Job.cs" />
     <Compile Include="JobParameter.cs" />
+    <Compile Include="JobParameterViewModel.cs" />
     <Compile Include="LoginViewModel.cs" />
     <Compile Include="Migrations\201403261205298_InitialCreate.cs" />
     <Compile Include="Migrations\201403261205298_InitialCreate.Designer.cs">
@@ -96,11 +97,17 @@
     <Compile Include="Migrations\201403281016428_JobParameter.Designer.cs">
       <DependentUpon>201403281016428_JobParameter.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\201403290719225_ParameterValue Change.cs" />
+    <Compile Include="Migrations\201403290719225_ParameterValue Change.Designer.cs">
+      <DependentUpon>201403290719225_ParameterValue Change.cs</DependentUpon>
+    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Parameter.cs" />
     <Compile Include="ParameterValue.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repositories\IRepository.cs" />
+    <Compile Include="Repositories\JobRepository.cs" />
+    <Compile Include="Repositories\ParameterRepository.cs" />
     <Compile Include="SignupViewModel.cs" />
     <Compile Include="User.cs" />
     <Compile Include="UsersDbContext.cs" />
@@ -131,6 +138,9 @@
     <EmbeddedResource Include="Migrations\201403281016428_JobParameter.resx">
       <DependentUpon>201403281016428_JobParameter.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\201403290719225_ParameterValue Change.resx">
+      <DependentUpon>201403290719225_ParameterValue Change.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Sevomin.Tests/Controllers/Job/NewJob.cs b/Sevomin.Tests/Controllers/Job/NewJob.cs
index cf65435..fcf7bf3 100644
--- a/Sevomin.Tests/Controllers/Job/NewJob.cs
+++ b/Sevomin.Tests/Controllers/Job/NewJob.cs
@@ -12,17 +12,36 @@ namespace Sevomin.Tests.Controllers.Job
     [TestClass]
     public class NewJob
     {
+        public JobController GetCUT()
+        {
+            JobController cut = new JobController();
+            return cut;
+        }
+        
         [TestMethod]
         public void Returns_View_NewJob_JobController()
         {
             // Arrange
-            JobController cut = new JobController();
+            JobController cut = GetCUT();
             // Act
             var result = cut.NewJob() as ViewResult;
             // Assert
             Assert.IsNotNull(result);
             Assert.AreEqual(string.Empty, result.ViewName);
         }
-			
+
+        [TestMethod]
+        public void Returns_EmptyJobModel_NewJob_JobController()
+        {
+            // Arrange
+            JobController cut = GetCUT();
+            // Act
+            var result = cut.NewJob() as ViewResult;
+            // Assert
+            Assert.IsNotNull(result);
+            Assert.IsNotNull(result.Model);
+            Assert.IsInstanceOfType(result.Model, typeof(Models.Job));
+            Assert.AreNotEqual((result.Model as Models.Job).JobParameters.Count, 0);
+        }
     }
 }
diff --git a/Sevomin.Tests/Sevomin.Tests.csproj b/Sevomin.Tests/Sevomin.Tests.csproj
index 1532f08..9e2730d 100644
--- a/Sevomin.Tests/Sevomin.Tests.csproj
+++ b/Sevomin.Tests/Sevomin.Tests.csproj
@@ -75,6 +75,7 @@
   </Choose>
   <ItemGroup>
     <Compile Include="Controllers\Job\NewJob.cs" />
+    <Compile Include="FakeJobRepository.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Sevomin.WebFrontend.Controllers/JobController.cs b/Sevomin.WebFrontend.Controllers/JobController.cs
index 711ed00..efb5b37 100644
--- a/Sevomin.WebFrontend.Controllers/JobController.cs
+++ b/Sevomin.WebFrontend.Controllers/JobController.cs
@@ -4,14 +4,18 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web.Mvc;
+using Sevomin.Models;
+using Sevomin.Models.Repositories;
 
 namespace Sevomin.WebFrontend.Controllers
 {
     public class JobController : AuthorizedController
     {
+
         public ActionResult NewJob()
         {
-            return View();
+            Avalin avalin = null;
+            return View(JobRepository.Current.GetEmptyJobFor(avalin));
         }
 			
     }