diff --git a/data/createdatabase.sql b/data/createdatabase.sql
index 41b5a17..fc30d12 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.xolani.dlamini]    Script Date: 1/21/2019 9:11:50 PM ******/
+CREATE DATABASE [sql101.xolani.dlamini]
  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.Xolani.Dlamini', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.Xolani.Dlamini.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.Xolani.Dlamini_log', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.Xolani.Dlamini_log.ldf' , SIZE = 8192KB , MAXSIZE = 2048GB , FILEGROWTH = 65536KB )
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET COMPATIBILITY_LEVEL = 130
+ALTER DATABASE [sql101.xolani.dlamini] SET COMPATIBILITY_LEVEL = 130
 GO
 
 IF (1 = FULLTEXTSERVICEPROPERTY('IsFullTextInstalled'))
 begin
-EXEC [sql101.firstname.lastname].[dbo].[sp_fulltext_database] @action = 'enable'
+EXEC [sql101.xolani.dlamini].[dbo].[sp_fulltext_database] @action = 'enable'
 end
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_NULL_DEFAULT OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET ANSI_NULL_DEFAULT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_NULLS OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET ANSI_NULLS OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_PADDING OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET ANSI_PADDING OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_WARNINGS OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET ANSI_WARNINGS OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ARITHABORT OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET ARITHABORT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_CLOSE OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET AUTO_CLOSE OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_SHRINK OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET AUTO_SHRINK OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_UPDATE_STATISTICS ON 
+ALTER DATABASE [sql101.xolani.dlamini] SET AUTO_UPDATE_STATISTICS ON 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET CURSOR_CLOSE_ON_COMMIT OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET CURSOR_CLOSE_ON_COMMIT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET CURSOR_DEFAULT  GLOBAL 
+ALTER DATABASE [sql101.xolani.dlamini] SET CURSOR_DEFAULT  GLOBAL 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET CONCAT_NULL_YIELDS_NULL OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET CONCAT_NULL_YIELDS_NULL OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET NUMERIC_ROUNDABORT OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET NUMERIC_ROUNDABORT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET QUOTED_IDENTIFIER OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET QUOTED_IDENTIFIER OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET RECURSIVE_TRIGGERS OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET RECURSIVE_TRIGGERS OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET  DISABLE_BROKER 
+ALTER DATABASE [sql101.xolani.dlamini] SET  DISABLE_BROKER 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_UPDATE_STATISTICS_ASYNC OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET AUTO_UPDATE_STATISTICS_ASYNC OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET DATE_CORRELATION_OPTIMIZATION OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET DATE_CORRELATION_OPTIMIZATION OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET TRUSTWORTHY OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET TRUSTWORTHY OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ALLOW_SNAPSHOT_ISOLATION OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET ALLOW_SNAPSHOT_ISOLATION OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET PARAMETERIZATION SIMPLE 
+ALTER DATABASE [sql101.xolani.dlamini] SET PARAMETERIZATION SIMPLE 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET READ_COMMITTED_SNAPSHOT OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET READ_COMMITTED_SNAPSHOT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET HONOR_BROKER_PRIORITY OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET HONOR_BROKER_PRIORITY OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET RECOVERY FULL 
+ALTER DATABASE [sql101.xolani.dlamini] SET RECOVERY FULL 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET  MULTI_USER 
+ALTER DATABASE [sql101.xolani.dlamini] SET  MULTI_USER 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET PAGE_VERIFY CHECKSUM  
+ALTER DATABASE [sql101.xolani.dlamini] SET PAGE_VERIFY CHECKSUM  
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET DB_CHAINING OFF 
+ALTER DATABASE [sql101.xolani.dlamini] SET DB_CHAINING OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET FILESTREAM( NON_TRANSACTED_ACCESS = OFF ) 
+ALTER DATABASE [sql101.xolani.dlamini] SET FILESTREAM( NON_TRANSACTED_ACCESS = OFF ) 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET TARGET_RECOVERY_TIME = 60 SECONDS 
+ALTER DATABASE [sql101.xolani.dlamini] SET TARGET_RECOVERY_TIME = 60 SECONDS 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET DELAYED_DURABILITY = DISABLED 
+ALTER DATABASE [sql101.xolani.dlamini] SET DELAYED_DURABILITY = DISABLED 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET QUERY_STORE = OFF
+ALTER DATABASE [sql101.xolani.dlamini] SET QUERY_STORE = OFF
 GO
 
-USE [sql101.firstname.lastname]
+USE [sql101.xolani.dlamini]
 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.xolani.dlamini] SET  READ_WRITE 
 GO
 
 
diff --git a/data/createuser.sql b/data/createuser.sql
index bcf3038..3febcc1 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 [xolanidlamini] WITH PASSWORD=N'rabbit123!@#' MUST_CHANGE, DEFAULT_DATABASE=[sql101.xolani.dlamini], CHECK_EXPIRATION=ON, CHECK_POLICY=ON
 GO
-use [sql101.firstname.lastname]
+use [sql101.xolani.dlamini]
 
 GO
 use [master]
 
 GO
-USE [sql101.firstname.lastname]
+USE [sql101.xolani.dlamini]
 GO
-CREATE USER [firstnamelastname] FOR LOGIN [firstnamelastname]
+CREATE USER [xolanidlamini] FOR LOGIN [xolanidlamini]
 GO
-USE [sql101.firstname.lastname]
+USE [sql101.xolani.dlamini]
 GO
-ALTER ROLE [db_owner] ADD MEMBER [firstnamelastname]
+ALTER ROLE [db_owner] ADD MEMBER [xolanidlamini]
 GO
diff --git a/src/MyTimesheet/MyTimesheet/CacheSecrets.config b/src/MyTimesheet/MyTimesheet/CacheSecrets.config
new file mode 100644
index 0000000..b6cf31c
--- /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>  
diff --git a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs
index b2f5a7c..5820e5c 100644
--- a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs
+++ b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs
@@ -1,10 +1,14 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using MyTimesheet.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Configuration;
+using StackExchange.Redis;
+
 
 namespace MyTimesheet.Controllers
 {
@@ -13,9 +17,11 @@ 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
@@ -34,10 +40,25 @@ public async Task<ActionResult<TimesheetEntry>> Get(int id)
 
         // POST api/values
         [HttpPost]
-        public async Task Post([FromBody] TimesheetEntry value)
+        public async Task<String> Post([FromBody] TimesheetEntry value)
         {
             await _db.Entries.AddAsync(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.StringGetAsync($"{value.Id}");
+
+            var cacheItem = await cache.StringGetAsync($"{value.Id}");
+
+            lazyConnection.Value.Dispose();
+
+            return cacheItem;
+
         }
 
         // PUT api/values/5
@@ -47,6 +68,21 @@ public async Task 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.Id}", value.ToString());
+
+            var cacheItem = await cache.StringGetAsync($"{value.Id}");
+           
+            lazyConnection.Value.Dispose();
+
         }
 
         // DELETE api/values/5
@@ -59,3 +95,4 @@ public async Task Delete(int id)
         }
     }
 }
+    
\ No newline at end of file
diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190122084922_InitialCreate.Designer.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190122084922_InitialCreate.Designer.cs
new file mode 100644
index 0000000..ab03f00
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/20190122084922_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("20190122084922_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/20190122084922_InitialCreate.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190122084922_InitialCreate.cs
new file mode 100644
index 0000000..f49fcb6
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/20190122084922_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/20190126095525_2ndMigration.Designer.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190126095525_2ndMigration.Designer.cs
new file mode 100644
index 0000000..7d40ab6
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/20190126095525_2ndMigration.Designer.cs
@@ -0,0 +1,55 @@
+// <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("20190126095525_2ndMigration")]
+    partial class _2ndMigration
+    {
+        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<int>("Client_ID");
+
+                    b.Property<DateTime>("Date");
+
+                    b.Property<string>("Description");
+
+                    b.Property<int>("Duration");
+
+                    b.Property<int>("Employee_ID");
+
+                    b.Property<string>("Project");
+
+                    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/20190126095525_2ndMigration.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190126095525_2ndMigration.cs
new file mode 100644
index 0000000..e105400
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/20190126095525_2ndMigration.cs
@@ -0,0 +1,60 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace MyTimesheet.Migrations
+{
+    public partial class _2ndMigration : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Client",
+                table: "Entries");
+
+            migrationBuilder.DropColumn(
+                name: "Name",
+                table: "Entries");
+
+            migrationBuilder.DropColumn(
+                name: "Surname",
+                table: "Entries");
+
+            migrationBuilder.AddColumn<int>(
+                name: "Client_ID",
+                table: "Entries",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "Employee_ID",
+                table: "Entries",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Client_ID",
+                table: "Entries");
+
+            migrationBuilder.DropColumn(
+                name: "Employee_ID",
+                table: "Entries");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Client",
+                table: "Entries",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Name",
+                table: "Entries",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Surname",
+                table: "Entries",
+                nullable: true);
+        }
+    }
+}
diff --git a/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs b/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs
new file mode 100644
index 0000000..944132d
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs
@@ -0,0 +1,53 @@
+// <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<int>("Client_ID");
+
+                    b.Property<DateTime>("Date");
+
+                    b.Property<string>("Description");
+
+                    b.Property<int>("Duration");
+
+                    b.Property<int>("Employee_ID");
+
+                    b.Property<string>("Project");
+
+                    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/ClientEntry.cs b/src/MyTimesheet/MyTimesheet/Models/ClientEntry.cs
new file mode 100644
index 0000000..97d4075
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Models/ClientEntry.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MyTimesheet.Models
+{
+    public class ClientEntry
+    {
+        [Key]
+        public int Client_ID { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/src/MyTimesheet/MyTimesheet/Models/EmployeeEntry.cs b/src/MyTimesheet/MyTimesheet/Models/EmployeeEntry.cs
new file mode 100644
index 0000000..aef89dc
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Models/EmployeeEntry.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MyTimesheet.Models
+{
+    public class EmployeeEntry
+    {
+
+        [Key]
+        public int Employee_ID { get; set; }
+        public string Name { get; set; }
+        public string Surname { get; set; }
+    }
+}
diff --git a/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs b/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs
index 8c65667..f24b776 100644
--- a/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs
+++ b/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -14,10 +15,14 @@ public class TimesheetEntry
            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 string Client { get; set; }
+        [ForeignKey("employee")]
+        public int Employee_ID { get; set; }
+
+        [ForeignKey("client")]
+        public int Client_ID { get; set; }
+           
         public string Project { get; set; }
         public DateTime Date { get; set; }
         public DateTime TimeStart { get; set; }
@@ -25,5 +30,8 @@ public class TimesheetEntry
         public int Duration { get; set; }
         public string Description { get; set; }
         public bool Billable { get; set; }
+
+
+
     }
 }
diff --git a/src/MyTimesheet/MyTimesheet/Startup.cs b/src/MyTimesheet/MyTimesheet/Startup.cs
index e81072d..0954729 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.xolani.dlamini;User Id=xolanidlamini;Password=159357olanI#;";
             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..9dfd8a5 100644
--- a/src/MyTimesheet/MyTimesheet/appsettings.json
+++ b/src/MyTimesheet/MyTimesheet/appsettings.json
@@ -4,5 +4,6 @@
       "Default": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "CacheConnection": "101.redis.cache.windows.net,abortConnect=false,ssl=true,password=85BYRVqUHV6aW7Jz8zIIxRnaYMgbBd2kwo4bpDiz4vw="
 }