diff --git a/data/createdatabase.sql b/data/createdatabase.sql
index 41b5a17..f4bd2ca 100644
--- a/data/createdatabase.sql
+++ b/data/createdatabase.sql
@@ -1,115 +1,115 @@
 USE [master]
 GO
 
-/****** Object:  Database [sql101.firstname.lastname]    Script Date: 1/21/2019 9:11:50 PM ******/
-CREATE DATABASE [sql101.firstname.lastname]
+/****** Object:  Database [sql101.Fiwa.Lekhulani]    Script Date: 1/21/2019 9:11:50 PM ******/
+CREATE DATABASE [sql101.Fiwa.Lekhulani]
  CONTAINMENT = NONE
  ON  PRIMARY 
-( NAME = N'sql101.firstname.lastname', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.firstname.lastname.mdf' , SIZE = 8192KB , MAXSIZE = UNLIMITED, FILEGROWTH = 65536KB )
+( NAME = N'sql101.Fiwa.Lekhulani', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.Fiwa.Lekhulani.mdf' , SIZE = 8192KB , MAXSIZE = UNLIMITED, FILEGROWTH = 65536KB )
  LOG ON 
-( NAME = N'sql101.firstname.lastname_log', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.firstname.lastname_log.ldf' , SIZE = 8192KB , MAXSIZE = 2048GB , FILEGROWTH = 65536KB )
+( NAME = N'sql101.Fiwa.Lekhulani_log', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.Fiwa.Lekhulani_log.ldf' , SIZE = 8192KB , MAXSIZE = 2048GB , FILEGROWTH = 65536KB )
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET COMPATIBILITY_LEVEL = 130
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET COMPATIBILITY_LEVEL = 130
 GO
 
 IF (1 = FULLTEXTSERVICEPROPERTY('IsFullTextInstalled'))
 begin
-EXEC [sql101.firstname.lastname].[dbo].[sp_fulltext_database] @action = 'enable'
+EXEC [sql101.Fiwa.Lekhulani].[dbo].[sp_fulltext_database] @action = 'enable'
 end
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_NULL_DEFAULT OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET ANSI_NULL_DEFAULT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_NULLS OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET ANSI_NULLS OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_PADDING OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET ANSI_PADDING OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_WARNINGS OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET ANSI_WARNINGS OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ARITHABORT OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET ARITHABORT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_CLOSE OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET AUTO_CLOSE OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_SHRINK OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET AUTO_SHRINK OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_UPDATE_STATISTICS ON 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET AUTO_UPDATE_STATISTICS ON 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET CURSOR_CLOSE_ON_COMMIT OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET CURSOR_CLOSE_ON_COMMIT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET CURSOR_DEFAULT  GLOBAL 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET CURSOR_DEFAULT  GLOBAL 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET CONCAT_NULL_YIELDS_NULL OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET CONCAT_NULL_YIELDS_NULL OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET NUMERIC_ROUNDABORT OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET NUMERIC_ROUNDABORT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET QUOTED_IDENTIFIER OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET QUOTED_IDENTIFIER OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET RECURSIVE_TRIGGERS OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET RECURSIVE_TRIGGERS OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET  DISABLE_BROKER 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET  DISABLE_BROKER 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_UPDATE_STATISTICS_ASYNC OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET AUTO_UPDATE_STATISTICS_ASYNC OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET DATE_CORRELATION_OPTIMIZATION OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET DATE_CORRELATION_OPTIMIZATION OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET TRUSTWORTHY OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET TRUSTWORTHY OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ALLOW_SNAPSHOT_ISOLATION OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET ALLOW_SNAPSHOT_ISOLATION OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET PARAMETERIZATION SIMPLE 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET PARAMETERIZATION SIMPLE 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET READ_COMMITTED_SNAPSHOT OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET READ_COMMITTED_SNAPSHOT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET HONOR_BROKER_PRIORITY OFF 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET HONOR_BROKER_PRIORITY OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET RECOVERY FULL 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET RECOVERY FULL 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET  MULTI_USER 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET  MULTI_USER 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET PAGE_VERIFY CHECKSUM  
+ALTER DATABASE [sql101.FIwa.Lekhulani] SET PAGE_VERIFY CHECKSUM  
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET DB_CHAINING OFF 
+ALTER DATABASE [sql101.FIwa.Lekhulani] SET DB_CHAINING OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET FILESTREAM( NON_TRANSACTED_ACCESS = OFF ) 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET FILESTREAM( NON_TRANSACTED_ACCESS = OFF ) 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET TARGET_RECOVERY_TIME = 60 SECONDS 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET TARGET_RECOVERY_TIME = 60 SECONDS 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET DELAYED_DURABILITY = DISABLED 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET DELAYED_DURABILITY = DISABLED 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET QUERY_STORE = OFF
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET QUERY_STORE = OFF
 GO
 
-USE [sql101.firstname.lastname]
+USE [sql101.Fiwa.Lekhulani]
 GO
 
 ALTER DATABASE SCOPED CONFIGURATION SET LEGACY_CARDINALITY_ESTIMATION = OFF;
@@ -124,7 +124,7 @@ GO
 ALTER DATABASE SCOPED CONFIGURATION SET QUERY_OPTIMIZER_HOTFIXES = OFF;
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET  READ_WRITE 
+ALTER DATABASE [sql101.Fiwa.Lekhulani] SET  READ_WRITE 
 GO
 
 
diff --git a/data/createuser.sql b/data/createuser.sql
index bcf3038..42fbdef 100644
--- a/data/createuser.sql
+++ b/data/createuser.sql
@@ -1,18 +1,18 @@
 USE [master]
 GO
-CREATE LOGIN [firstnamelastname] WITH PASSWORD=N'rabbit123!@#' MUST_CHANGE, DEFAULT_DATABASE=[sql101.firstname.lastname], CHECK_EXPIRATION=ON, CHECK_POLICY=ON
+CREATE LOGIN [FiwaLekhulani] WITH PASSWORD='fiwa1234!' MUST_CHANGE, DEFAULT_DATABASE=[sql101.Fiwa.Lekhulani], CHECK_EXPIRATION=ON, CHECK_POLICY=ON
 GO
-use [sql101.firstname.lastname]
+use [sql101.Fiwa.Lekhulani]
 
 GO
 use [master]
 
 GO
-USE [sql101.firstname.lastname]
+USE [sql101.Fiwa.Lekhulani]
 GO
-CREATE USER [firstnamelastname] FOR LOGIN [firstnamelastname]
+CREATE USER [FiwaLekhulani] FOR LOGIN [FiwaLekhulani]
 GO
-USE [sql101.firstname.lastname]
+USE [sql101.Fiwa.Lekhulani]
 GO
-ALTER ROLE [db_owner] ADD MEMBER [firstnamelastname]
+ALTER ROLE [db_owner] ADD MEMBER [FiwaLekhulani]
 GO
diff --git a/src/MyTimesheet/MyTimesheet/CacheSecrets.config b/src/MyTimesheet/MyTimesheet/CacheSecrets.config
new file mode 100644
index 0000000..89e5544
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/CacheSecrets.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appSettings>
+    <add key="CacheConnection" value="101.redis.cache.windows.net,abortConnect=false,ssl=true,password=85BYRVqUHV6aW7Jz8zIIxRnaYMgbBd2kwo4bpDiz4vw="/>
+</appSettings>
\ No newline at end of file
diff --git a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs
index b2f5a7c..4c3bbcb 100644
--- a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs
+++ b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs
@@ -1,6 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using MyTimesheet.Models;
+using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,18 +15,44 @@ namespace MyTimesheet.Controllers
     public class TimesheetController : ControllerBase
     {
         private readonly TimesheetContext _db;
-        public TimesheetController(TimesheetContext context)
+        readonly IConfiguration _config;
+        public TimesheetController(TimesheetContext context, IConfiguration config)
         {
             _db = context;
+            _config = config;
         }
 
-        // GET api/values
+
         [HttpGet]
-        public async Task<ActionResult<IEnumerable<TimesheetEntry>>> Get()
+        public async Task<ActionResult<string>> Get()
         {
-            return await _db.Entries.ToListAsync();
+
+            var cacheConnection = _config.GetValue<string>("CacheConnection").ToString();
+            var lazyConnection = new Lazy<ConnectionMultiplexer>(() =>
+            {
+                return ConnectionMultiplexer.Connect(cacheConnection);
+            });
+
+            IDatabase cache = lazyConnection.Value.GetDatabase();
+            var cacheItem = cache.Execute("KEYS", "LIST").ToString();
+
+            lazyConnection.Value.Dispose();
+
+            var entries = await _db.Entries.ToListAsync();
+
+            if (cacheItem == null)
+            {
+                return entries.ToString();
+            }
+            else
+            {
+                return cacheItem;
+            }
+            //Have to find out why this was commented out
+            //return await _db.Entries.ToListAsync();
         }
 
+
         // GET api/values/5
         [HttpGet("{id}")]
         public async Task<ActionResult<TimesheetEntry>> Get(int id)
@@ -42,11 +70,26 @@ public async Task Post([FromBody] TimesheetEntry value)
 
         // PUT api/values/5
         [HttpPut("{id}")]
-        public async Task Put(int id, [FromBody] TimesheetEntry value)
+        public async Task<RedisValue> Put(int id, [FromBody] TimesheetEntry value)
         {
             var entry = await _db.Entries.FindAsync(id);
             entry = value;
             await _db.SaveChangesAsync();
+
+            var cacheConnection = _config.GetValue<string>("CacheConnection").ToString();
+            var lazyConnection = new Lazy<ConnectionMultiplexer>(() =>
+            {
+                return ConnectionMultiplexer.Connect(cacheConnection);
+            });
+
+            IDatabase cache = lazyConnection.Value.GetDatabase();
+            await cache.StringSetAsync($"{value.EntryId}", value.ToString());
+
+            var cacheItem = await cache.StringGetAsync($"{value.EntryId}");
+
+            lazyConnection.Value.Dispose();
+
+            return cacheItem;
         }
 
         // DELETE api/values/5
diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190122090457_InitialCreate.Designer.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190122090457_InitialCreate.Designer.cs
new file mode 100644
index 0000000..d1e1151
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/20190122090457_InitialCreate.Designer.cs
@@ -0,0 +1,57 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using MyTimesheet.Models;
+
+namespace MyTimesheet.Migrations
+{
+    [DbContext(typeof(TimesheetContext))]
+    [Migration("20190122090457_InitialCreate")]
+    partial class InitialCreate
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.1-servicing-10028")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("Billable");
+
+                    b.Property<string>("Client");
+
+                    b.Property<DateTime>("Date");
+
+                    b.Property<string>("Description");
+
+                    b.Property<int>("Duration");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Project");
+
+                    b.Property<string>("Surname");
+
+                    b.Property<DateTime>("TimeEnd");
+
+                    b.Property<DateTime>("TimeStart");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Entries");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190122090457_InitialCreate.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190122090457_InitialCreate.cs
new file mode 100644
index 0000000..f49fcb6
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/20190122090457_InitialCreate.cs
@@ -0,0 +1,40 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace MyTimesheet.Migrations
+{
+    public partial class InitialCreate : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Entries",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Name = table.Column<string>(nullable: true),
+                    Surname = table.Column<string>(nullable: true),
+                    Client = table.Column<string>(nullable: true),
+                    Project = table.Column<string>(nullable: true),
+                    Date = table.Column<DateTime>(nullable: false),
+                    TimeStart = table.Column<DateTime>(nullable: false),
+                    TimeEnd = table.Column<DateTime>(nullable: false),
+                    Duration = table.Column<int>(nullable: false),
+                    Description = table.Column<string>(nullable: true),
+                    Billable = table.Column<bool>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Entries", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Entries");
+        }
+    }
+}
diff --git a/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs b/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs
new file mode 100644
index 0000000..6404921
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs
@@ -0,0 +1,55 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using MyTimesheet.Models;
+
+namespace MyTimesheet.Migrations
+{
+    [DbContext(typeof(TimesheetContext))]
+    partial class TimesheetContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.1-servicing-10028")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("Billable");
+
+                    b.Property<string>("Client");
+
+                    b.Property<DateTime>("Date");
+
+                    b.Property<string>("Description");
+
+                    b.Property<int>("Duration");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Project");
+
+                    b.Property<string>("Surname");
+
+                    b.Property<DateTime>("TimeEnd");
+
+                    b.Property<DateTime>("TimeStart");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Entries");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/MyTimesheet/MyTimesheet/Models/Employee.cs b/src/MyTimesheet/MyTimesheet/Models/Employee.cs
new file mode 100644
index 0000000..ab0e61b
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Models/Employee.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MyTimesheet.Models
+{
+    public class Employee
+    {
+        public int empId { get; set; }
+        public string Name { get; set; }
+        public string Surname { get; set; }
+    }
+}
+
diff --git a/src/MyTimesheet/MyTimesheet/Models/Project.cs b/src/MyTimesheet/MyTimesheet/Models/Project.cs
new file mode 100644
index 0000000..5bf3977
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Models/Project.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MyTimesheet.Models
+{
+    public class Project
+    {
+        public string ProjectId { get; set; }
+        public string Name { get; set; }
+        public DateTime TimeStart { get; set; }
+        public DateTime TimeEnd { get; set; }
+        public int Duration { get; set; }
+        public string Description { get; set; }
+        public bool Billable { get; set; }
+    }
+}
+
diff --git a/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs b/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs
index 5bf7e22..567ff40 100644
--- a/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs
+++ b/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs
@@ -12,7 +12,8 @@ public TimesheetContext(DbContextOptions<TimesheetContext> options)
             : base(options)
         { }
 
-        public DbSet<TimesheetEntry> Entries { get; set; }
-
+        //public DbSet<TimesheetEntry> Entries { get; set; }
+        public DbSet<Employee> Employees { get; set; }
+        public DbSet<Project> Projects { get; set; }
     }
 }
diff --git a/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs b/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs
index 8c65667..debcc69 100644
--- a/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs
+++ b/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs
@@ -7,23 +7,10 @@ namespace MyTimesheet.Models
 {
     public class TimesheetEntry
     {
-        /*
-           Name | Surname | Client | Project | Date | Time Started | Time ended | Duration | Description | Billable
-           --- | --- | --- | --- | --- | --- | --- | --- | --- | ---
-           John | Doe | Client X | Website | 2019-01-22 | 09:00 | 11:00 | 120 | I was rocking HTML5  | YES
-           John | Doe | Client X | API | 2019-01-22 | 13:00 | 17:00 | 240 | Grafting on golang api  | YES
-         */
-
-        public int Id { get; set; }
-        public string Name { get; set; }
-        public string Surname { get; set; }
+        public int Id { get; set;
+        public Employee Employee { get; set; }        
+        public Project Project { get; set; }
         public string Client { get; set; }
-        public string Project { get; set; }
         public DateTime Date { get; set; }
-        public DateTime TimeStart { get; set; }
-        public DateTime TimeEnd { get; set; }
-        public int Duration { get; set; }
-        public string Description { get; set; }
-        public bool Billable { get; set; }
     }
 }
diff --git a/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj b/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj
index 54dfccf..8ea9319 100644
--- a/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj
+++ b/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj
@@ -5,6 +5,14 @@
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Models\TimesheetEntry.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="Models\TimesheetEntry.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
diff --git a/src/MyTimesheet/MyTimesheet/Startup.cs b/src/MyTimesheet/MyTimesheet/Startup.cs
index e81072d..293363c 100644
--- a/src/MyTimesheet/MyTimesheet/Startup.cs
+++ b/src/MyTimesheet/MyTimesheet/Startup.cs
@@ -35,9 +35,10 @@ public void ConfigureServices(IServiceCollection services)
                 c.SwaggerDoc("v1", new Info { Title = "My Timesheet API", Version = "v1" });
             });
 
-            var connection = @"Server=sql101labs1793591179000.westeurope.cloudapp.azure.com;Database=sql101.#NAME.SURNAME;User Id=myUsername;Password=myPassword;";
+            var connection = @"Server=sql101labs1793591179000.westeurope.cloudapp.azure.com;Database=sql101.Fiwa.Lekhulani;User Id=FiwaLekhulani;Password=fiwa1234!;";
             services.AddDbContext<TimesheetContext>
                 (options => options.UseSqlServer(connection));
+            services.AddSingleton(Configuration);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/src/MyTimesheet/MyTimesheet/appsettings.json b/src/MyTimesheet/MyTimesheet/appsettings.json
index def9159..3eba329 100644
--- a/src/MyTimesheet/MyTimesheet/appsettings.json
+++ b/src/MyTimesheet/MyTimesheet/appsettings.json
@@ -4,5 +4,7 @@
       "Default": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "CacheCOnnection": "101.redis.cache.windows.net.redis.cache.windows.net,abortConnect=false,ssl=true,password=85BYRVqUHV6aW7Jz8zIIxRnaYMgbBd2kwo4bpDiz4vw="
+  
 }