diff --git a/data/createdatabase.sql b/data/createdatabase.sql
index 41b5a17..348c774 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.mpinane.mohale]    Script Date: 1/21/2019 9:11:50 PM ******/
+CREATE DATABASE [sql101.mpinane.mohale]
  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.mpinane.mohale', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.mpinane.mohale.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.mpinane.mohale_log', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.mpinane.mohale_log.ldf' , SIZE = 8192KB , MAXSIZE = 2048GB , FILEGROWTH = 65536KB )
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET COMPATIBILITY_LEVEL = 130
+ALTER DATABASE [sql101.mpinane.mohale] SET COMPATIBILITY_LEVEL = 130
 GO
 
 IF (1 = FULLTEXTSERVICEPROPERTY('IsFullTextInstalled'))
 begin
-EXEC [sql101.firstname.lastname].[dbo].[sp_fulltext_database] @action = 'enable'
+EXEC [sql101.mpinane.mohale].[dbo].[sp_fulltext_database] @action = 'enable'
 end
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_NULL_DEFAULT OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET ANSI_NULL_DEFAULT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_NULLS OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET ANSI_NULLS OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_PADDING OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET ANSI_PADDING OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ANSI_WARNINGS OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET ANSI_WARNINGS OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ARITHABORT OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET ARITHABORT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_CLOSE OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET AUTO_CLOSE OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_SHRINK OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET AUTO_SHRINK OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_UPDATE_STATISTICS ON 
+ALTER DATABASE [sql101.mpinane.mohale] SET AUTO_UPDATE_STATISTICS ON 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET CURSOR_CLOSE_ON_COMMIT OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET CURSOR_CLOSE_ON_COMMIT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET CURSOR_DEFAULT  GLOBAL 
+ALTER DATABASE [sql101.mpinane.mohale] SET CURSOR_DEFAULT  GLOBAL 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET CONCAT_NULL_YIELDS_NULL OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET CONCAT_NULL_YIELDS_NULL OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET NUMERIC_ROUNDABORT OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET NUMERIC_ROUNDABORT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET QUOTED_IDENTIFIER OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET QUOTED_IDENTIFIER OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET RECURSIVE_TRIGGERS OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET RECURSIVE_TRIGGERS OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET  DISABLE_BROKER 
+ALTER DATABASE [sql101.mpinane.mohale] SET  DISABLE_BROKER 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET AUTO_UPDATE_STATISTICS_ASYNC OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET AUTO_UPDATE_STATISTICS_ASYNC OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET DATE_CORRELATION_OPTIMIZATION OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET DATE_CORRELATION_OPTIMIZATION OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET TRUSTWORTHY OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET TRUSTWORTHY OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET ALLOW_SNAPSHOT_ISOLATION OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET ALLOW_SNAPSHOT_ISOLATION OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET PARAMETERIZATION SIMPLE 
+ALTER DATABASE [sql101.mpinane.mohale] SET PARAMETERIZATION SIMPLE 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET READ_COMMITTED_SNAPSHOT OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET READ_COMMITTED_SNAPSHOT OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET HONOR_BROKER_PRIORITY OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET HONOR_BROKER_PRIORITY OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET RECOVERY FULL 
+ALTER DATABASE [sql101.mpinane.mohale] SET RECOVERY FULL 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET  MULTI_USER 
+ALTER DATABASE [sql101.mpinane.mohale] SET  MULTI_USER 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET PAGE_VERIFY CHECKSUM  
+ALTER DATABASE [sql101.mpinane.mohale] SET PAGE_VERIFY CHECKSUM  
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET DB_CHAINING OFF 
+ALTER DATABASE [sql101.mpinane.mohale] SET DB_CHAINING OFF 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET FILESTREAM( NON_TRANSACTED_ACCESS = OFF ) 
+ALTER DATABASE [sql101.mpinane.mohale] SET FILESTREAM( NON_TRANSACTED_ACCESS = OFF ) 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET TARGET_RECOVERY_TIME = 60 SECONDS 
+ALTER DATABASE [sql101.mpinane.mohale] SET TARGET_RECOVERY_TIME = 60 SECONDS 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET DELAYED_DURABILITY = DISABLED 
+ALTER DATABASE [sql101.mpinane.mohale] SET DELAYED_DURABILITY = DISABLED 
 GO
 
-ALTER DATABASE [sql101.firstname.lastname] SET QUERY_STORE = OFF
+ALTER DATABASE [sql101.mpinane.mohale] SET QUERY_STORE = OFF
 GO
 
-USE [sql101.firstname.lastname]
+USE [sql101.mpinane.mohale]
 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.mpinane.mohale] SET  READ_WRITE 
 GO
 
 
diff --git a/data/createuser.sql b/data/createuser.sql
index bcf3038..05d5f56 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 [mpinanemohale] WITH PASSWORD=N'rabbit123!@#' MUST_CHANGE, DEFAULT_DATABASE=[sql101.mpinane.mohale], CHECK_EXPIRATION=ON, CHECK_POLICY=ON
 GO
-use [sql101.firstname.lastname]
+use [sql101.mpinane.mohale]
 
 GO
 use [master]
 
 GO
-USE [sql101.firstname.lastname]
+USE [sql101.mpinane.mohale]
 GO
-CREATE USER [firstnamelastname] FOR LOGIN [firstnamelastname]
+CREATE USER [mpinanemohale] FOR LOGIN [mpinanemohale]
 GO
-USE [sql101.firstname.lastname]
+USE [sql101.mpinane.mohale]
 GO
-ALTER ROLE [db_owner] ADD MEMBER [firstnamelastname]
+ALTER ROLE [db_owner] ADD MEMBER [mpinanemohale]
 GO
diff --git a/src/MyTimesheet/MyTimesheet/CacheSecrets.config b/src/MyTimesheet/MyTimesheet/CacheSecrets.config
new file mode 100644
index 0000000..fbacd61
--- /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..9a1277d 100644
--- a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs
+++ b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs
@@ -1,6 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.IdentityModel.Protocols;
 using MyTimesheet.Models;
+using Newtonsoft.Json;
+using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,49 +17,118 @@ 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 lazyConnection = new Lazy<ConnectionMultiplexer>(() =>
+            {
+                string cacheConnection = _config.GetValue<string>("CacheConnection").ToString();
+                return ConnectionMultiplexer.Connect(cacheConnection);
+            });
+
+            IDatabase cache = lazyConnection.Value.GetDatabase();
+
+            var cacheItem = cache.Execute("KEYS", "*");
+
+            if (cacheItem == null)
+            {
+                return (await _db.Entries.ToListAsync()).ToString();
+            }
+
+            return cacheItem.ToString();
+            
         }
 
         // GET api/values/5
         [HttpGet("{id}")]
-        public async Task<ActionResult<TimesheetEntry>> Get(int id)
+        public async Task<ActionResult<string>> Get(int id)
         {
-            return await _db.Entries.FindAsync(id);
+
+            var lazyConnection = new Lazy<ConnectionMultiplexer>(() =>
+            {
+                string cacheConnection = _config.GetValue<string>("CacheConnection").ToString();
+                return ConnectionMultiplexer.Connect(cacheConnection);
+            });
+
+            IDatabase cache = lazyConnection.Value.GetDatabase();
+
+            var cacheItem = await cache.StringGetAsync(id.ToString());
+
+            if(cacheItem.IsNull)
+            {
+                return JsonConvert.SerializeObject(await _db.Entries.FindAsync(id)).ToString();
+            }
+
+            return cacheItem.ToString();
         }
 
         // 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();
-        }
 
-        // PUT api/values/5
-        [HttpPut("{id}")]
-        public async Task Put(int id, [FromBody] TimesheetEntry value)
-        {
-            var entry = await _db.Entries.FindAsync(id);
-            entry = value;
-            await _db.SaveChangesAsync();
-        }
+            var lazyConnection = new Lazy<ConnectionMultiplexer>(() =>
+            {
+                string cacheConnection = _config.GetValue<string>("CacheConnection").ToString();
+                return ConnectionMultiplexer.Connect(cacheConnection);
+            });
+
+
+            IDatabase cache = lazyConnection.Value.GetDatabase() ;
 
-        // DELETE api/values/5
-        [HttpDelete("{id}")]
-        public async Task Delete(int id)
+            TimesheetEntry results = _db.Entries.Include(v => v.Employee).Include(c => c.Project).Include(v => v.Project.Client).FirstOrDefault(x => x.Id == value.Id);
+
+             await cache.StringSetAsync($"{value.Employee.Name}-{value.Employee.Surname}", JsonConvert.SerializeObject(results));
+
+            var   cacheItem =  await cache.StringGetAsync($"{value.Employee.Name}-{value.Employee.Surname}");
+
+             
+           
+              lazyConnection.Value.Dispose();
+            
+
+           return cacheItem.ToString();
+
+    }
+  
+    // PUT api/values/5
+    [HttpPut("{id}")]
+    public async Task Put(int id, [FromBody] TimesheetEntry value)
+    {
+        var entry = await _db.Entries.FindAsync(id);
+        entry = value; 
+        await _db.SaveChangesAsync();
+
+        var lazyConnection = new Lazy<ConnectionMultiplexer>(() =>
         {
-            var entry = await _db.Entries.FindAsync(id);
-            _db.Entries.Remove(entry);
-            await _db.SaveChangesAsync();
-        }
+            string cacheConnection = _config.GetValue<string>("CacheConnection").ToString();
+            return ConnectionMultiplexer.Connect(cacheConnection);
+        });
+
+        IDatabase cache = lazyConnection.Value.GetDatabase();
+        await cache.StringSetAsync($"{value.Employee.Name}-{value.Employee.Surname}", JsonConvert.SerializeObject(entry));
+
     }
+
+    // DELETE api/values/5
+    [HttpDelete("{id}")]
+    public async Task Delete(int id)
+    {
+        var entry = await _db.Entries.FindAsync(id);
+        _db.Entries.Remove(entry);
+        await _db.SaveChangesAsync();
+    }
+}
 }
diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.Designer.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.Designer.cs
new file mode 100644
index 0000000..0d5a997
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.Designer.cs
@@ -0,0 +1,118 @@
+// <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("20190126142316_TimeSheet")]
+    partial class TimeSheet
+    {
+        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.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("MyTimesheet.Models.Employee", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Surname");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("MyTimesheet.Models.Project", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("ClientId");
+
+                    b.Property<int>("Name");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Projects");
+                });
+
+            modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("Billable");
+
+                    b.Property<DateTime>("Date");
+
+                    b.Property<string>("Description");
+
+                    b.Property<int?>("EmployeeId");
+
+                    b.Property<int?>("ProjectId");
+
+                    b.Property<DateTime>("TimeEnd");
+
+                    b.Property<DateTime>("TimeStart");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.ToTable("Entries");
+                });
+
+            modelBuilder.Entity("MyTimesheet.Models.Project", b =>
+                {
+                    b.HasOne("MyTimesheet.Models.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+                });
+
+            modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b =>
+                {
+                    b.HasOne("MyTimesheet.Models.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId");
+
+                    b.HasOne("MyTimesheet.Models.Project", "Project")
+                        .WithMany()
+                        .HasForeignKey("ProjectId");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.cs
new file mode 100644
index 0000000..cb44280
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.cs
@@ -0,0 +1,120 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace MyTimesheet.Migrations
+{
+    public partial class TimeSheet : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Clients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Name = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Clients", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Employees",
+                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)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Employees", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Projects",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Name = table.Column<int>(nullable: false),
+                    ClientId = table.Column<int>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Projects", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Projects_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Entries",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    EmployeeId = table.Column<int>(nullable: true),
+                    ProjectId = table.Column<int>(nullable: true),
+                    Date = table.Column<DateTime>(nullable: false),
+                    TimeStart = table.Column<DateTime>(nullable: false),
+                    TimeEnd = table.Column<DateTime>(nullable: false),
+                    Description = table.Column<string>(nullable: true),
+                    Billable = table.Column<bool>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Entries", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Entries_Employees_EmployeeId",
+                        column: x => x.EmployeeId,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_Entries_Projects_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "Projects",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Entries_EmployeeId",
+                table: "Entries",
+                column: "EmployeeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Entries_ProjectId",
+                table: "Entries",
+                column: "ProjectId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Projects_ClientId",
+                table: "Projects",
+                column: "ClientId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Entries");
+
+            migrationBuilder.DropTable(
+                name: "Employees");
+
+            migrationBuilder.DropTable(
+                name: "Projects");
+
+            migrationBuilder.DropTable(
+                name: "Clients");
+        }
+    }
+}
diff --git a/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs b/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs
new file mode 100644
index 0000000..9a28f89
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs
@@ -0,0 +1,116 @@
+// <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.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("MyTimesheet.Models.Employee", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Surname");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("MyTimesheet.Models.Project", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("ClientId");
+
+                    b.Property<int>("Name");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Projects");
+                });
+
+            modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("Billable");
+
+                    b.Property<DateTime>("Date");
+
+                    b.Property<string>("Description");
+
+                    b.Property<int?>("EmployeeId");
+
+                    b.Property<int?>("ProjectId");
+
+                    b.Property<DateTime>("TimeEnd");
+
+                    b.Property<DateTime>("TimeStart");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.ToTable("Entries");
+                });
+
+            modelBuilder.Entity("MyTimesheet.Models.Project", b =>
+                {
+                    b.HasOne("MyTimesheet.Models.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+                });
+
+            modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b =>
+                {
+                    b.HasOne("MyTimesheet.Models.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId");
+
+                    b.HasOne("MyTimesheet.Models.Project", "Project")
+                        .WithMany()
+                        .HasForeignKey("ProjectId");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/MyTimesheet/MyTimesheet/Models/Client.cs b/src/MyTimesheet/MyTimesheet/Models/Client.cs
new file mode 100644
index 0000000..a229007
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Models/Client.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MyTimesheet.Models
+{
+    public class Client
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+
+
+}
diff --git a/src/MyTimesheet/MyTimesheet/Models/Employee.cs b/src/MyTimesheet/MyTimesheet/Models/Employee.cs
new file mode 100644
index 0000000..e61e5fe
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Models/Employee.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MyTimesheet.Models
+{
+    public class Employee
+    {
+        [Key]
+       public int Id { 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..b1386b4
--- /dev/null
+++ b/src/MyTimesheet/MyTimesheet/Models/Project.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MyTimesheet.Models
+{
+    public class Project
+    {
+       [Key]
+        public int Id { get; set; }
+        public int Name { get; set; }
+        public Client Client { get; set; }
+    }
+
+
+}
diff --git a/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs b/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs
index 5bf7e22..37df804 100644
--- a/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs
+++ b/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs
@@ -13,6 +13,9 @@ public TimesheetContext(DbContextOptions<TimesheetContext> options)
         { }
 
         public DbSet<TimesheetEntry> Entries { get; set; }
+        public DbSet<Project> Projects { get; set; }
+        public DbSet<Employee> Employees { get; set; }
+        public DbSet<Client> Clients { get; set; }
 
     }
 }
diff --git a/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs b/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs
index 8c65667..39d8d2f 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;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -7,23 +8,16 @@ 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
-         */
-
+        [Key]
         public int Id { get; set; }
-        public string Name { get; set; }
-        public string Surname { get; set; }
-        public string Client { get; set; }
-        public string Project { get; set; }
+        public  Employee Employee{ get; set; }
+        public Project 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..4764672 100644
--- a/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj
+++ b/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj
@@ -9,8 +9,16 @@
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="StackExchange.Redis" Version="2.0.519" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Migrations\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/MyTimesheet/MyTimesheet/Startup.cs b/src/MyTimesheet/MyTimesheet/Startup.cs
index e81072d..7f89293 100644
--- a/src/MyTimesheet/MyTimesheet/Startup.cs
+++ b/src/MyTimesheet/MyTimesheet/Startup.cs
@@ -35,7 +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.mpinane.mohale;User Id=mpinanemohale;Password=rabbit123!@#";
+            //Injecting a service
+            services.AddSingleton(Configuration);
+            //done
             services.AddDbContext<TimesheetContext>
                 (options => options.UseSqlServer(connection));
         }
diff --git a/src/MyTimesheet/MyTimesheet/appsettings.json b/src/MyTimesheet/MyTimesheet/appsettings.json
index def9159..c011a48 100644
--- a/src/MyTimesheet/MyTimesheet/appsettings.json
+++ b/src/MyTimesheet/MyTimesheet/appsettings.json
@@ -1,8 +1,9 @@
 {
-  "Logging": {
-    "LogLevel": {
-      "Default": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
+	"Logging": {
+		"LogLevel": {
+			"Default": "Warning"
+		}
+	},
+	"AllowedHosts": "*",
+	"CacheConnection": "101.redis.cache.windows.net,abortConnect=false,ssl=true,password=85BYRVqUHV6aW7Jz8zIIxRnaYMgbBd2kwo4bpDiz4vw="
 }