diff --git a/database/README.md b/database/README.md
index 7950470..adfdf56 100644
--- a/database/README.md
+++ b/database/README.md
@@ -18,7 +18,7 @@ MS SQL database
     ```
 
     ```
-    docker run -d --name POLLOR_DATABASE -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=myPassw0rd' -p 1433:1433 mcr.microsoft.com/mssql/server:2022-latest
+    docker run -d --name POLLOR_DATABASE -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=myPassw0rd" -p 1433:1433 mcr.microsoft.com/mssql/server:2022-latest
     ```
 
     ```
diff --git a/database/migration.sql b/database/migration.sql
index 240b194..295171e 100644
--- a/database/migration.sql
+++ b/database/migration.sql
@@ -14,11 +14,14 @@ GO
 CREATE TABLE [dbo].[users](
 	[id] [int] IDENTITY(1,1) NOT NULL,
 	[emailaddress] [nvarchar](256) NOT NULL,
-	[first_name] [nvarchar](64) NOT NULL,
-	[last_name] [nvarchar](64) NOT NULL,
-	[profile_username] [nvarchar](64) NOT NULL,
+	[username] [nvarchar](64) NOT NULL,
+	[password] [nvarchar](128) NOT NULL,
+	[first_name] [nvarchar](64) NULL,
+	[last_name] [nvarchar](64) NULL,
+	[role] [nvarchar](32) NULL DEFAULT 'user',
 	[created_at] [datetime] NOT NULL,
-	CONSTRAINT PK_users PRIMARY KEY NONCLUSTERED (id)
+	CONSTRAINT PK_users PRIMARY KEY NONCLUSTERED (id),
+	CONSTRAINT UC_Users UNIQUE (id,emailaddress,username)
 ) ON [PRIMARY]
 GO
 
diff --git a/database/seed.sql b/database/seed.sql
index f6ed6d2..34c4451 100644
--- a/database/seed.sql
+++ b/database/seed.sql
@@ -1,8 +1,8 @@
 USE [pollor_db]
 GO
 
-INSERT INTO users (emailaddress, first_name, last_name, profile_username, created_at)
-VALUES ('test@test.nl', 'Tester', 'Test', 'Testing', '1970-01-01T00:00:01');
+INSERT INTO users (emailaddress, first_name, last_name, username, password, created_at)
+VALUES ('test@test.nl', 'Tester', 'Test', 'Testing', '', '1970-01-01T00:00:01');
 GO
 
 INSERT INTO polls (user_id, question, ending_date, created_at)
diff --git a/pollor.Server/.env.example b/pollor.Server/.env.example
index 1c5ea20..eaad519 100644
--- a/pollor.Server/.env.example
+++ b/pollor.Server/.env.example
@@ -3,4 +3,6 @@ DB_SERVER=localhost\MSSQLSERVERx
 DB_NAME=name
 DB_UID=
 DB_PASSWORD=
-ASPNETCORE_ENVIRONMENT=Development
\ No newline at end of file
+ASPNETCORE_ENVIRONMENT=Development
+SECRET_JWT_KEY=secret-hash-key
+JWT_TOKEN_DOMAIN=https://localhost:5001
diff --git a/pollor.Server/Controllers/AnswersController.cs b/pollor.Server/Controllers/AnswersController.cs
index 162dc08..30b175d 100644
--- a/pollor.Server/Controllers/AnswersController.cs
+++ b/pollor.Server/Controllers/AnswersController.cs
@@ -3,11 +3,13 @@
 using pollor.Server.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace answeror.Server.Controllers
 {
     [ApiController]
-    [Route("[controller]")]
+    [Route("api/")]
     public class AnswersController : ControllerBase
     {
         private readonly ILogger<AnswersController> _logger;
@@ -17,7 +19,7 @@ public AnswersController(ILogger<AnswersController> logger)
             _logger = logger;
         }
 
-        [HttpGet(Name = "GetAnswersController")]
+        [HttpGet("answers")]
         public IActionResult GetAllAnswers()
         {
             try {
@@ -26,7 +28,7 @@ public IActionResult GetAllAnswers()
                         .Include(a => a.Votes)
                         .ToList();
                     if (answers.IsNullOrEmpty()) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(answers);
                 }
@@ -37,17 +39,17 @@ public IActionResult GetAllAnswers()
             }
         }
 
-        [HttpGet("{id}")]
+        [HttpGet("answer/{id}")]
         public IActionResult GetAnswerById(int id)
         {
             try {
                 using (var context = new PollorDbContext()) {
                     AnswerModel? answer = context.Answers
-                        .Where(p => p.Id.Equals(id))
+                        .Where(p => p.id.Equals(id))
                         .Include(a => a.Votes)
                         .FirstOrDefault();
                     if (answer == null) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(answer);
                 }
@@ -57,5 +59,26 @@ public IActionResult GetAnswerById(int id)
                 return StatusCode(500, new { message = ex.Message});
             }
         }
+
+        [HttpPost("answer")]
+        [Authorize]
+        public IActionResult AddAnswer(AnswerModel answer)
+        {
+            try {
+                using (var context = new PollorDbContext()) {
+                    EntityEntry<AnswerModel> newAnswer = context.Answers.Add(answer);
+                    context.SaveChanges();
+
+                    if (newAnswer == null) {
+                        return NotFound(new { message = "No records found" });
+                    }
+                    return Created("answer/" + newAnswer.Entity.id.ToString(), newAnswer.Entity);
+                }
+            }
+            catch (Exception ex) {
+                _logger.LogError(ex, ex.Message);
+                return StatusCode(500, new { message = ex.Message});
+            }
+        }
     }
 }
diff --git a/pollor.Server/Controllers/AuthController.cs b/pollor.Server/Controllers/AuthController.cs
new file mode 100644
index 0000000..d02ed59
--- /dev/null
+++ b/pollor.Server/Controllers/AuthController.cs
@@ -0,0 +1,196 @@
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using System.Text;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.IdentityModel.Tokens;
+using Microsoft.AspNetCore.Identity;
+using pollor.Server.Models;
+using pollor.Server.Services;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using System.Security.Principal;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.AspNetCore.Authorization;
+using pollor.Server.Controllers;
+using System.Data;
+
+[Route("api/auth")]
+[ApiController]
+public class AuthController : ControllerBase
+{
+    private readonly ILogger<AuthController> _logger;
+
+    public AuthController(ILogger<AuthController> logger)
+    {
+        _logger = logger;
+    }
+
+
+    [HttpPost("register")]
+    public IActionResult Register([FromBody] RegisterModel registerUser)
+    {
+        if (registerUser is null)
+        {
+            return BadRequest(new { message = "Invalid client request" });
+        }
+
+        if (registerUser.password!.Length < 8) {
+            return BadRequest(new { message = "Password must be longer than 8 characters." });
+        }
+
+        bool isUsernameAvailable = new PollorDbContext().UserAuthModel.Where(u => u.username!.ToLower().Equals(registerUser.username!.ToLower())).IsNullOrEmpty();
+        if (isUsernameAvailable == false) {
+            return BadRequest(new { message = "Username is already taken, please login or use another username." });
+        }
+
+        bool isEmailAvailable = new PollorDbContext().UserAuthModel.Where(u => u.emailaddress!.ToLower().Equals(registerUser.emailaddress!.ToLower())).IsNullOrEmpty();
+        if (isEmailAvailable == false) {
+            return BadRequest(new { message = "Emailaddress is already taken, please login or use another emailaddress." });
+        }
+
+        var hasher = new PasswordHasher<RegisterModel>();
+        var hashedPass = hasher.HashPassword(registerUser, registerUser.password!);
+        UserAuthModel tempUser = new UserAuthModel() {
+            username = registerUser.username,
+            password = hashedPass,
+            emailaddress = registerUser.emailaddress,
+            created_at = DateTime.Now,
+        };
+
+        try
+        {
+            using (var context = new PollorDbContext())
+            {
+                // Create new user
+                EntityEntry<UserAuthModel> createdUser = context.UserAuthModel.Add(tempUser);
+                context.SaveChanges();
+
+                // Get full user data
+                UserModel? newUser = context.Users
+                    .Where(u => u.id.Equals(createdUser.Entity.id) &&
+                            u.username!.Equals(createdUser.Entity.username) &&
+                            u.emailaddress!.Equals(createdUser.Entity.emailaddress))
+                    .FirstOrDefault();
+                if (newUser == null)
+                {
+                    return NotFound(new { message = "User not found..." });
+                }
+                var tokeOptions = GetJwtTokenOptions(1, newUser);
+                var tokenString = new JwtSecurityTokenHandler().WriteToken(tokeOptions);
+                return Created("user/" + newUser.id, new AuthenticatedResponse { token = tokenString, user = newUser });
+
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, ex.Message);
+            return StatusCode(500, new { message = ex.Message });
+        }
+    }
+
+
+    [HttpPost("login")]
+    public IActionResult Login([FromBody] LoginModel loginUser)
+    {
+        if (loginUser is null)
+        {
+            return BadRequest(new { message = "Invalid client request" });
+        }
+
+        var authUser = new PollorDbContext().UserAuthModel.Where(u => u.username!.ToLower().Equals(loginUser.username!.ToLower())).FirstOrDefault();
+        if (authUser == null) {
+            return Unauthorized(new { message = "Username or password is wrong!" });
+        }
+
+        var hasher = new PasswordHasher<LoginModel>();
+        PasswordVerificationResult passwordIsOk = hasher.VerifyHashedPassword(loginUser, authUser.password!, loginUser.password!);
+
+        if (passwordIsOk == PasswordVerificationResult.Failed) {
+            return Unauthorized(new { message = "Username or password is wrong!" });
+        }
+
+        if (authUser.username == loginUser.username && (passwordIsOk == PasswordVerificationResult.Success || passwordIsOk == PasswordVerificationResult.SuccessRehashNeeded))
+        {
+            if (passwordIsOk == PasswordVerificationResult.SuccessRehashNeeded) {
+                // rehash password and save to DB
+                _logger.LogError("Rehash password and save to DB");
+            }
+
+            int tokenLongerValid = (bool)loginUser.tokenLongerValid ? 31 : 1;// true = 31, false = 1
+            var currentUser = new PollorDbContext().Users.Where(u => u.username!.ToLower().Equals(authUser.username!.ToLower())).FirstOrDefault();
+            var tokenOptions = GetJwtTokenOptions(tokenLongerValid, currentUser!);
+            var tokenString = new JwtSecurityTokenHandler().WriteToken(tokenOptions);
+
+            return Ok(new AuthenticatedResponse { token = tokenString, user = currentUser});
+        }
+
+        return Unauthorized(new { message = "something went wrong" } );
+    }
+
+    [HttpPost("validate")]
+    [Authorize]
+    public IActionResult Validate([FromBody] ValidateTokenModel validateTokenModel)
+    {
+        // Retrieve the JWT token from the Authorization header
+        var token = HttpContext.Request.Headers["Authorization"].FirstOrDefault()?.Split(" ").Last();
+
+        if (string.IsNullOrEmpty(token))
+        {
+            return BadRequest(new { message = "Token is missing" });
+        }
+
+        SecurityToken validatedToken;
+        IPrincipal principal = new JwtSecurityTokenHandler().ValidateToken(token, AuthService.GetValidationParameters(), out validatedToken);
+
+        // The user is authenticated, and you can access user information
+        var userClaims = HttpContext.User;
+        // Perform additional validation or return success response
+
+        var username = userClaims.Claims.Where(e => e.Type.EndsWith("identity/claims/name")).Select(e => e.Value).SingleOrDefault();
+        var userId = userClaims.Claims.Where(e => e.Type.EndsWith("identity/claims/nameidentifier")).Select(e => e.Value).SingleOrDefault();
+        var userRole = userClaims.Claims.Where(e => e.Type.EndsWith("identity/claims/role")).Select(e => e.Value).SingleOrDefault();
+
+        try
+        {
+            using (var context = new PollorDbContext())
+            {
+                UserModel? user = context.Users
+                    .Where(u => u.id.ToString().Equals(userId) &&
+                            u.username!.Equals(username) &&
+                            u.role!.Equals(userRole))
+                    .FirstOrDefault();
+                if (user == null)
+                {
+                    return NotFound(new { message = "User not found..." });
+                }
+                return Ok(new AuthenticatedResponse { token = validateTokenModel.token, user = user });
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, ex.Message);
+            return StatusCode(500, new { message = ex.Message });
+        }
+    }
+
+    private JwtSecurityToken GetJwtTokenOptions (int tokenValidForXDays, UserModel user) {
+        var jwtClaims = new List<Claim>
+        {
+            new Claim(ClaimTypes.Name, user.username!),
+            new Claim(ClaimTypes.NameIdentifier, user.id.ToString()),
+            new Claim(ClaimTypes.Role, user.role!)
+        };
+
+        String jwtTokenDomain = Environment.GetEnvironmentVariable("JWT_TOKEN_DOMAIN")!.Split(',').FirstOrDefault()!;
+
+        var secretKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(Environment.GetEnvironmentVariable("SECRET_JWT_KEY")!));
+        var signinCredentials = new SigningCredentials(secretKey, SecurityAlgorithms.HmacSha256);
+        var tokeOptions = new JwtSecurityToken(
+            issuer: jwtTokenDomain,
+            audience: jwtTokenDomain,
+            claims: jwtClaims,
+            expires: DateTime.Now.AddDays(tokenValidForXDays),
+            signingCredentials: signinCredentials
+        );
+        return tokeOptions;
+    }
+}
\ No newline at end of file
diff --git a/pollor.Server/Controllers/PollsController.cs b/pollor.Server/Controllers/PollsController.cs
index bef93d0..7e61183 100644
--- a/pollor.Server/Controllers/PollsController.cs
+++ b/pollor.Server/Controllers/PollsController.cs
@@ -1,5 +1,7 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
 using pollor.Server.Models;
@@ -8,7 +10,7 @@
 namespace pollor.Server.Controllers
 {
     [ApiController]
-    [Route("[controller]")]
+    [Route("api/")]
     public class PollsController : ControllerBase
     {
         private readonly ILogger<PollsController> _logger;
@@ -18,7 +20,7 @@ public PollsController(ILogger<PollsController> logger)
             _logger = logger;
         }
 
-        [HttpGet(Name = "GetPollsController")]
+        [HttpGet("polls")]
         public IActionResult GetAllPolls()
         {
             try {
@@ -28,7 +30,7 @@ public IActionResult GetAllPolls()
                             .ThenInclude(a => a.Votes)
                         .ToList();
                     if (polls.IsNullOrEmpty()) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(polls);
                 }
@@ -39,18 +41,18 @@ public IActionResult GetAllPolls()
             }
         }
 
-        [HttpGet("{id}")]
+        [HttpGet("poll/{id}")]
         public IActionResult GetPollById(int id)
         {
             try {
                 using (var context = new PollorDbContext()) {
                     PollModel? poll = context.Polls
-                        .Where(p => p.Id.Equals(id))
+                        .Where(p => p.id.Equals(id))
                         .Include(p => p.Answers)
                             .ThenInclude(a => a.Votes)
                         .FirstOrDefault();
                     if (poll == null) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(poll);
                 }
@@ -60,5 +62,26 @@ public IActionResult GetPollById(int id)
                 return StatusCode(500, new { message = ex.Message});
             }
         }
+
+        [HttpPost("poll")]
+        [Authorize]
+        public IActionResult AddPoll(PollModel poll)
+        {
+            try {
+                using (var context = new PollorDbContext()) {
+                    EntityEntry<PollModel> newPoll = context.Polls.Add(poll);
+                    context.SaveChanges();
+
+                    if (newPoll == null) {
+                        return NotFound(new { message = "No records found" });
+                    }
+                    return Created("poll/" + newPoll.Entity.id.ToString(), newPoll.Entity);
+                }
+            }
+            catch (Exception ex) {
+                _logger.LogError(ex, ex.Message);
+                return StatusCode(500, new { message = ex.Message});
+            }
+        }
     }
 }
diff --git a/pollor.Server/Controllers/UsersController.cs b/pollor.Server/Controllers/UsersController.cs
index 8fcd45b..6a3e8d2 100644
--- a/pollor.Server/Controllers/UsersController.cs
+++ b/pollor.Server/Controllers/UsersController.cs
@@ -1,13 +1,16 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
 using pollor.Server.Models;
 using pollor.Server.Services;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Principal;
 
 namespace pollor.Server.Controllers
 {
     [ApiController]
-    [Route("[controller]")]
+    [Route("api/")]
     public class UsersController : ControllerBase
     {
         private readonly ILogger<UsersController> _logger;
@@ -17,7 +20,7 @@ public UsersController(ILogger<UsersController> logger)
             _logger = logger;
         }
 
-        [HttpGet(Name = "GetUsersController")]
+        [HttpGet("users")]
         public IActionResult GetAllUsers()
         {
             try {
@@ -28,7 +31,7 @@ public IActionResult GetAllUsers()
                                 .ThenInclude(a => a.Votes)
                         .ToList();
                     if (users.IsNullOrEmpty()) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(users);
                 }
@@ -39,19 +42,65 @@ public IActionResult GetAllUsers()
             }
         }
 
-        [HttpGet("{id}")]
+        [HttpGet("user")]
+        [Authorize]
+        public IActionResult GetCurrentUser()
+        {
+            // Retrieve the JWT token from the Authorization header
+            var token = HttpContext.Request.Headers["Authorization"].FirstOrDefault()?.Split(" ").Last();
+
+            if (string.IsNullOrEmpty(token))
+            {
+                return BadRequest(new { message = "Token is missing" });
+            }
+
+            SecurityToken validatedToken;
+            IPrincipal principal = new JwtSecurityTokenHandler().ValidateToken(token, AuthService.GetValidationParameters(), out validatedToken);
+
+            // The user is authenticated, and you can access user information
+            var userClaims = HttpContext.User;
+            // Perform additional validation or return success response
+
+            var username = userClaims.Claims.Where(e => e.Type.EndsWith("identity/claims/name")).Select(e => e.Value).SingleOrDefault();
+            var userId = userClaims.Claims.Where(e => e.Type.EndsWith("identity/claims/nameidentifier")).Select(e => e.Value).SingleOrDefault();
+            var userRole = userClaims.Claims.Where(e => e.Type.EndsWith("identity/claims/role")).Select(e => e.Value).SingleOrDefault();
+
+            try
+            {
+                using (var context = new PollorDbContext())
+                {
+                    UserModel? user = context.Users
+                        .Where(u => u.id.ToString().Equals(userId) &&
+                            u.username!.Equals(username) &&
+                            u.role!.Equals(userRole))
+                        .FirstOrDefault();
+                    if (user == null)
+                    {
+                        return NotFound(new { message = "No records found" });
+                    }
+                    return Ok(user);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, ex.Message);
+                return StatusCode(500, new { message = ex.Message });
+            }
+        }
+
+        [HttpGet("user/{id}")]
         public IActionResult GetUserById(int id)
         {
             try {
                 using (var context = new PollorDbContext()) {
                     UserModel? user = context.Users
-                        .Where(u => u.Id.Equals(id))
+                        .Where(u => u.id.Equals(id))
                         .Include(u => u.Polls)
                             .ThenInclude(p => p.Answers)
                                 .ThenInclude(a => a.Votes)
                         .FirstOrDefault();
                     if (user == null) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(user);
                 }
diff --git a/pollor.Server/Controllers/VotesController.cs b/pollor.Server/Controllers/VotesController.cs
index 615fbba..46658e7 100644
--- a/pollor.Server/Controllers/VotesController.cs
+++ b/pollor.Server/Controllers/VotesController.cs
@@ -1,5 +1,7 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.IdentityModel.Tokens;
 using pollor.Server.Models;
 using pollor.Server.Services;
@@ -7,7 +9,7 @@
 namespace pollor.Server.Controllers
 {
     [ApiController]
-    [Route("[controller]")]
+    [Route("api/")]
     public class VotesController : ControllerBase
     {
         private readonly ILogger<VotesController> _logger;
@@ -17,14 +19,14 @@ public VotesController(ILogger<VotesController> logger)
             _logger = logger;
         }
 
-        [HttpGet(Name = "GetVotesController")]
+        [HttpGet("votes")]
         public IActionResult GetAllVotes()
         {
             try {
                 using (var context = new PollorDbContext()) {
                     List<VoteModel>? votes = context.Votes.ToList();
                     if (votes.IsNullOrEmpty()) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(votes);
                 }
@@ -35,16 +37,16 @@ public IActionResult GetAllVotes()
             }
         }
 
-        [HttpGet("{id}")]
+        [HttpGet("vote/{id}")]
         public IActionResult GetVoteById(int id)
         {
             try {
                 using (var context = new PollorDbContext()) {
                     VoteModel? vote = context.Votes
-                        .Where(v => v.Id.Equals(id))
+                        .Where(v => v.id.Equals(id))
                         .FirstOrDefault();
                     if (vote == null) {
-                        return NotFound();
+                        return NotFound(new { message = "No records found" });
                     }
                     return Ok(vote);
                 }
@@ -54,5 +56,26 @@ public IActionResult GetVoteById(int id)
                 return StatusCode(500, new { message = ex.Message});
             }
         }
+
+        [HttpPost("vote")]
+        [Authorize]
+        public IActionResult AddVote(VoteModel vote)
+        {
+            try {
+                using (var context = new PollorDbContext()) {
+                    EntityEntry<VoteModel> newVote = context.Votes.Add(vote);
+                    context.SaveChanges();
+
+                    if (newVote == null) {
+                        return NotFound(new { message = "No records found" });
+                    }
+                    return Created("vote/" + newVote.Entity.id.ToString(), newVote.Entity);
+                }
+            }
+            catch (Exception ex) {
+                _logger.LogError(ex, ex.Message);
+                return StatusCode(500, new { message = ex.Message});
+            }
+        }
     }
 }
diff --git a/pollor.Server/Models/AnswerModel.cs b/pollor.Server/Models/AnswerModel.cs
index 99f99ba..2f062b7 100644
--- a/pollor.Server/Models/AnswerModel.cs
+++ b/pollor.Server/Models/AnswerModel.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace pollor.Server.Models
@@ -8,8 +9,9 @@ public partial class AnswerModel : SuperModel
         public AnswerModel() {
             Votes = new List<VoteModel>();
         }
-
-        public virtual int Poll_id { get; set; }
+        
+        public int poll_id { get; set; }
+        [StringLength(256)]
         public string? poll_answer { get; set; }
         
         [ForeignKey("answer_id")] // ForeignKey attribute in the VoteModel
diff --git a/pollor.Server/Models/AuthModel.cs b/pollor.Server/Models/AuthModel.cs
new file mode 100644
index 0000000..199a01a
--- /dev/null
+++ b/pollor.Server/Models/AuthModel.cs
@@ -0,0 +1,42 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace pollor.Server.Models
+{
+    public class RegisterModel
+    {
+        [Required, StringLength(256)]
+        public string? emailaddress { get; set; }
+        [Required, StringLength(64)]
+        public string? username { get; set; }
+        [Required, StringLength(128)]
+        public string? password { get; set; }
+        [Required, StringLength(128)]
+        public string? confirmPassword { get; set; }
+    }
+
+    public class LoginModel
+    {
+        [Required, StringLength(64)]
+        public string? username { get; set; }
+        [Required, StringLength(128)]
+        public string? password { get; set; }
+        public bool tokenLongerValid { get; set; } = false;
+    }
+
+    public class ChangePasswordModel
+    {
+        [Required]
+        public int? id { get; set; }
+        [Required, StringLength(128)]
+        public string? newpassword { get; set; }
+        [Required, StringLength(128)]
+        public string? confirmPassword { get; set; }
+    }
+
+    public class ValidateTokenModel
+    {
+        public string? token { get; set; }
+        [Required, StringLength(32)]
+        public string? role { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/pollor.Server/Models/AuthenticatedResponse.cs b/pollor.Server/Models/AuthenticatedResponse.cs
new file mode 100644
index 0000000..6855ec9
--- /dev/null
+++ b/pollor.Server/Models/AuthenticatedResponse.cs
@@ -0,0 +1,8 @@
+namespace pollor.Server.Models
+{
+    public class AuthenticatedResponse
+    {
+        public string? token { get; set; }
+        public UserModel? user { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/pollor.Server/Models/PollModel.cs b/pollor.Server/Models/PollModel.cs
index 435022b..953d2b3 100644
--- a/pollor.Server/Models/PollModel.cs
+++ b/pollor.Server/Models/PollModel.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace pollor.Server.Models
@@ -9,11 +10,12 @@ public PollModel() {
             Answers = new List<AnswerModel>();
         }
 
-        public virtual int User_id { get; set; }
-        public string? Question { get; set; }
-        public DateTime Ending_date { get; set; }
+        public int user_id { get; set; }
+        [StringLength(512)]
+        public string? question { get; set; }
+        public DateTime ending_date { get; set; }
 
-        [ForeignKey("Poll_id")] // ForeignKey attribute in the AnswerModel
+        [ForeignKey("poll_id")] // ForeignKey attribute in the AnswerModel
         public virtual ICollection<AnswerModel> Answers { get; set; }
     }
 }
\ No newline at end of file
diff --git a/pollor.Server/Models/SuperModel.cs b/pollor.Server/Models/SuperModel.cs
index 48805c3..f4e2754 100644
--- a/pollor.Server/Models/SuperModel.cs
+++ b/pollor.Server/Models/SuperModel.cs
@@ -1,13 +1,13 @@
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace pollor.Server.Models
 {
     public class SuperModel
     {
-
-        [Column("id")]
-        public int Id { get; set; }
-        public DateTime Created_at { get; set; }
+        [Key, Column("id")]
+        public int id { get; set; }
+        public DateTime created_at { get; set; }
 
     }
 }
diff --git a/pollor.Server/Models/UserModel.cs b/pollor.Server/Models/UserModel.cs
index a88b8ce..cd73982 100644
--- a/pollor.Server/Models/UserModel.cs
+++ b/pollor.Server/Models/UserModel.cs
@@ -1,19 +1,39 @@
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace pollor.Server.Models
 {
+    public class BaseUserModel : SuperModel
+    {
+        [StringLength(64)]
+        public string? username { get; set; }
+        [StringLength(256)]
+        public string? emailaddress { get; set; }
+    }
+
     [Table("users")]
-    public class UserModel : SuperModel
+    public class UserModel: BaseUserModel
     {
         public UserModel() {
             Polls = new List<PollModel>();
         }
-
+        [StringLength(64)]
         public string? first_name { get; set; }
+        [StringLength(64)]
         public string? last_name { get; set; }
-        public string? profile_username { get; set; }
+        [StringLength(32)]
+        public string? role { get; set; }
 
         [ForeignKey("user_id")] // ForeignKey attribute in the PollModel
         public virtual ICollection<PollModel> Polls { get; set; }
     }
+
+    [Table("users", Schema = "dbo")]
+    public class UserAuthModel : BaseUserModel
+    {
+        [DataType(DataType.Password), StringLength(128)]
+        public string? password { get; set; }
+        [NotMapped, StringLength(128)]
+        public string? confirmPassword { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/pollor.Server/Models/VoteModel.cs b/pollor.Server/Models/VoteModel.cs
index cf0907e..3f98f90 100644
--- a/pollor.Server/Models/VoteModel.cs
+++ b/pollor.Server/Models/VoteModel.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace pollor.Server.Models
@@ -5,9 +6,12 @@ namespace pollor.Server.Models
     [Table("votes")]
     public partial class VoteModel : SuperModel
     {
-        public int Answer_id { get; set; }
+        public int answer_id { get; set; }
+        [MaxLength(4)]
         public byte[]? ipv4_address { get; set; }
+        [MaxLength(16)]
         public byte[]? ipv6_address { get; set; }
+        [MaxLength(12)]
         public char[]? mac_address { get; set; }
         public DateTime voted_at { get; set; }
     }
diff --git a/pollor.Server/Program.cs b/pollor.Server/Program.cs
index 07fbb8e..2fbd217 100644
--- a/pollor.Server/Program.cs
+++ b/pollor.Server/Program.cs
@@ -1,4 +1,8 @@
+using System.Text;
 using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.IdentityModel.Tokens;
+using Microsoft.OpenApi.Models;
 using pollor.Server.Services;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -23,10 +27,40 @@
     options.AddDefaultPolicy(
         policy =>
         {
-            policy.WithOrigins(corsDomains); // loading array of .env values as allowed CORS domains
+            policy.WithOrigins(corsDomains)             // loading array of .env values as allowed CORS domains
+                            .AllowAnyHeader()
+                            .AllowAnyMethod();
         });
 });
 
+/* get secret private jwt key value */
+String secretJwtKey = Environment.GetEnvironmentVariable("SECRET_JWT_KEY")!;
+
+/* If values are null or empty, give error message that values are missing in .env */
+if (secretJwtKey == null)
+{
+    throw new InvalidOperationException("secretJwtKey contains no value. Make sure SECRET_JWT_KEY is set in .env");
+}
+
+/* Add JWT authentication */
+builder.Services.AddAuthentication(opt => {
+        opt.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
+        opt.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
+    })
+    .AddJwtBearer(options =>
+    {
+        options.TokenValidationParameters = new TokenValidationParameters
+        {
+            ValidateIssuer = true,
+            ValidateAudience = true,
+            ValidateLifetime = true,
+            ValidateIssuerSigningKey = true,
+            ValidIssuer = "https://localhost:5001",
+            ValidAudience = "https://localhost:5001",
+            IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(secretJwtKey))
+        };
+    });
+
 // Add services to the container.
 
 builder.Services.AddControllers()
@@ -36,13 +70,38 @@
     });;
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(option =>
+{
+    option.SwaggerDoc("v1", new OpenApiInfo { Title = "Pollor API", Version = "v1" });
+    option.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+    {
+        In = ParameterLocation.Header,
+        Description = "Please enter a valid token",
+        Name = "Authorization",
+        Type = SecuritySchemeType.Http,
+        BearerFormat = "JWT",
+        Scheme = "Bearer"
+    });
+    option.AddSecurityRequirement(new OpenApiSecurityRequirement
+    {
+        {
+            new OpenApiSecurityScheme
+            {
+                Reference = new OpenApiReference
+                {
+                    Type=ReferenceType.SecurityScheme,
+                    Id="Bearer"
+                },
+                Name = "Bearer",
+                In = ParameterLocation.Header,
+            },
+            new List<string>()
+        }
+    });
+});
 
 var app = builder.Build();
 
-app.UseDefaultFiles();
-app.UseStaticFiles();
-
 app.UseCors();
 
 // Configure the HTTP request pipeline.
@@ -53,9 +112,11 @@
 }
 
 app.UseHttpsRedirection();
-
+app.UseAuthentication();
 app.UseAuthorization();
 
+app.UseStatusCodePages();
+
 app.MapControllers().RequireCors();
 
 app.MapFallbackToFile("/index.html");
diff --git a/pollor.Server/Properties/launchSettings.json b/pollor.Server/Properties/launchSettings.json
index 7ca1d1e..39eca2b 100644
--- a/pollor.Server/Properties/launchSettings.json
+++ b/pollor.Server/Properties/launchSettings.json
@@ -25,7 +25,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7267;http://localhost:5010",
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
diff --git a/pollor.Server/Services/AuthService.cs b/pollor.Server/Services/AuthService.cs
new file mode 100644
index 0000000..97b7261
--- /dev/null
+++ b/pollor.Server/Services/AuthService.cs
@@ -0,0 +1,24 @@
+using Microsoft.IdentityModel.Tokens;
+using System.Text;
+
+namespace pollor.Server.Services
+{
+    public class AuthService
+    {
+        public static TokenValidationParameters GetValidationParameters()
+        {
+            var secretKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(Environment.GetEnvironmentVariable("SECRET_JWT_KEY")!));
+            String jwtTokenDomain = Environment.GetEnvironmentVariable("JWT_TOKEN_DOMAIN")!.Split(',').FirstOrDefault()!;
+
+            return new TokenValidationParameters()
+            {
+                ValidateLifetime = true,
+                ValidateAudience = true,
+                ValidateIssuer = true,
+                ValidIssuer = jwtTokenDomain,
+                ValidAudience = jwtTokenDomain,
+                IssuerSigningKey = secretKey // The same key as the one that generate the token
+            };
+        }
+    }
+}
diff --git a/pollor.Server/Services/PollorDbContext.cs b/pollor.Server/Services/PollorDbContext.cs
index 855482e..f37372b 100644
--- a/pollor.Server/Services/PollorDbContext.cs
+++ b/pollor.Server/Services/PollorDbContext.cs
@@ -9,6 +9,7 @@ public class PollorDbContext : DbContext
 
         //entities
         public DbSet<UserModel> Users { get; set; }
+        public DbSet<UserAuthModel> UserAuthModel { get; set; }
         public DbSet<PollModel> Polls { get; set; }
         public DbSet<VoteModel> Votes { get; set; }
         public DbSet<AnswerModel> Answers { get; set; }
diff --git a/pollor.Server/pollor.Server.csproj b/pollor.Server/pollor.Server.csproj
index e9f73ad..f169e06 100644
--- a/pollor.Server/pollor.Server.csproj
+++ b/pollor.Server/pollor.Server.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="DotNetEnv" Version="2.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.SpaProxy">
       <Version>8.*-*</Version>
diff --git a/pollor.client/.env.example b/pollor.client/.env.example
index a975e12..aa02a07 100644
--- a/pollor.client/.env.example
+++ b/pollor.client/.env.example
@@ -1 +1 @@
-API_URL='https://localhost:7267'
+API_URL='https://localhost:5001'
diff --git a/pollor.client/angular.json b/pollor.client/angular.json
index 153c524..b307ff4 100644
--- a/pollor.client/angular.json
+++ b/pollor.client/angular.json
@@ -35,10 +35,12 @@
             ],
             "styles": [
               "src/styles.css",
-              "./node_modules/bootstrap/dist/css/bootstrap.min.css"
+              "./node_modules/bootstrap/dist/css/bootstrap.min.css",
+              "./node_modules/bootstrap-icons/font/bootstrap-icons.css"
+
             ],
             "scripts": [
-              "./node_modules/bootstrap/dist/js/bootstrap.min.js",
+              "./node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
             ]
           },
           "configurations": {
@@ -55,7 +57,7 @@
                   "maximumError": "4kb"
                 }
               ],
-              "outputHashing": "all",
+              "outputHashing": "all"
             },
             "development": {
               "optimization": false,
@@ -96,10 +98,11 @@
             ],
             "styles": [
               "src/styles.css",
-              "node_modules/bootstrap/dist/css/bootstrap.min.css"
+              "node_modules/bootstrap/dist/css/bootstrap.min.css",
+              "./node_modules/bootstrap-icons/font/bootstrap-icons.css"
             ],
             "scripts": [
-              "./node_modules/bootstrap/dist/js/bootstrap.min.js",
+              "./node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
             ],
             "karmaConfig": "karma.conf.js"
           }
diff --git a/pollor.client/package-lock.json b/pollor.client/package-lock.json
index 9ea2a10..9e4681d 100644
--- a/pollor.client/package-lock.json
+++ b/pollor.client/package-lock.json
@@ -1929,51 +1929,6 @@
       "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==",
       "dev": true
     },
-    "@fortawesome/angular-fontawesome": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.14.1.tgz",
-      "integrity": "sha512-Yb5HLiEOAxjSLEcaOM51CKIrzdfvoDafXVJERm9vufxfZkVZPZJgrZRgqwLVpejgq4/Ez6TqHZ6SqmJwdtRF6g==",
-      "requires": {
-        "tslib": "^2.6.2"
-      }
-    },
-    "@fortawesome/fontawesome-common-types": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz",
-      "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A=="
-    },
-    "@fortawesome/fontawesome-svg-core": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.1.tgz",
-      "integrity": "sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==",
-      "requires": {
-        "@fortawesome/fontawesome-common-types": "6.5.1"
-      }
-    },
-    "@fortawesome/free-brands-svg-icons": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.1.tgz",
-      "integrity": "sha512-093l7DAkx0aEtBq66Sf19MgoZewv1zeY9/4C7vSKPO4qMwEsW/2VYTUTpBtLwfb9T2R73tXaRDPmE4UqLCYHfg==",
-      "requires": {
-        "@fortawesome/fontawesome-common-types": "6.5.1"
-      }
-    },
-    "@fortawesome/free-regular-svg-icons": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.5.1.tgz",
-      "integrity": "sha512-m6ShXn+wvqEU69wSP84coxLbNl7sGVZb+Ca+XZq6k30SzuP3X4TfPqtycgUh9ASwlNh5OfQCd8pDIWxl+O+LlQ==",
-      "requires": {
-        "@fortawesome/fontawesome-common-types": "6.5.1"
-      }
-    },
-    "@fortawesome/free-solid-svg-icons": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.1.tgz",
-      "integrity": "sha512-S1PPfU3mIJa59biTtXJz1oI0+KAXW6bkAb31XKhxdxtuXDiUIFsih4JR1v5BbxY7hVHsD1RKq+jRkVRaf773NQ==",
-      "requires": {
-        "@fortawesome/fontawesome-common-types": "6.5.1"
-      }
-    },
     "@humanwhocodes/config-array": {
       "version": "0.11.13",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
@@ -3452,6 +3407,11 @@
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz",
       "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g=="
     },
+    "bootstrap-icons": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz",
+      "integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww=="
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
diff --git a/pollor.client/package.json b/pollor.client/package.json
index 79cc7a3..6e9e205 100644
--- a/pollor.client/package.json
+++ b/pollor.client/package.json
@@ -23,14 +23,10 @@
     "@angular/platform-browser": "^17.0.7",
     "@angular/platform-browser-dynamic": "^17.0.7",
     "@angular/router": "^17.0.7",
-    "@fortawesome/angular-fontawesome": "^0.14.1",
-    "@fortawesome/fontawesome-svg-core": "^6.4.2",
-    "@fortawesome/free-brands-svg-icons": "^6.4.2",
-    "@fortawesome/free-regular-svg-icons": "^6.4.2",
-    "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@ng-bootstrap/ng-bootstrap": "^16.0.0",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.2",
+    "bootstrap-icons": "^1.11.3",
     "jest-editor-support": "*",
     "run-script-os": "*",
     "rxjs": "~7.8.0",
diff --git a/pollor.client/src/app/alert-message/alert-message.css b/pollor.client/src/app/alert-message/alert-message.css
new file mode 100644
index 0000000..ee8a674
--- /dev/null
+++ b/pollor.client/src/app/alert-message/alert-message.css
@@ -0,0 +1,7 @@
+.alert-messages {
+    position: fixed;
+    bottom: 2rem;
+    right: 2rem;
+    width: 30%;
+    z-index: 120;
+}
\ No newline at end of file
diff --git a/pollor.client/src/app/alert-message/alert-message.html b/pollor.client/src/app/alert-message/alert-message.html
new file mode 100644
index 0000000..0cc3abf
--- /dev/null
+++ b/pollor.client/src/app/alert-message/alert-message.html
@@ -0,0 +1,9 @@
+<div class="alert-messages">
+    @for (alert of getAlertMessages(); track alert) {
+        <ngb-alert [type]="alert.type" (closed)="close(alert)">
+            <h4 class="alert-heading" [innerHTML]="alert.title"></h4>
+            <hr>
+            <p [innerHTML]="alert.message"></p>
+        </ngb-alert>
+    }
+</div>
\ No newline at end of file
diff --git a/pollor.client/src/app/alert-message/alert-message.ts b/pollor.client/src/app/alert-message/alert-message.ts
new file mode 100644
index 0000000..c141241
--- /dev/null
+++ b/pollor.client/src/app/alert-message/alert-message.ts
@@ -0,0 +1,67 @@
+import { Component } from '@angular/core';
+import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap';
+
+interface Alert {
+	type: string;
+	title: string;
+	message: string;
+}
+
+const ALERTS: Alert[] = [
+	// {
+	// 	type: 'info',
+	//  title: 'Test alert',
+	// 	message: 'This is an test alert',
+	// }
+];
+
+@Component({
+	selector: 'ngbd-alert-message',
+	standalone: true,
+	imports: [NgbAlertModule],
+	templateUrl: './alert-message.html',
+    styleUrl: './alert-message.css'
+
+})
+export class AlertMessage {
+	static alerts: Alert[] = ALERTS;
+
+    constructor() {
+        this.reset();
+    }
+
+	close(alert: Alert) {
+		AlertMessage.alerts.splice(AlertMessage.alerts.indexOf(alert), 1);
+	}
+
+    reset() {
+		AlertMessage.alerts = [];
+	}
+
+    static addAlert(alertType: string, alertTitle: string, alertMessage: string, timeout: number = 10000) {
+        const newAlert : Alert = {
+            type: alertType,
+			title: alertTitle,
+            message: alertMessage
+        };
+
+		AlertMessage.alerts.unshift(newAlert);
+
+      setTimeout(() => {
+          AlertMessage.alerts.splice(AlertMessage.alerts.indexOf(newAlert), 1);
+        }, timeout); // automatic close the alert after x miliseconds based
+  }
+
+
+  static addSuccessAlert(alertMessage: string) {
+    AlertMessage.addAlert("success", "Success!", alertMessage);
+  }
+
+    static addErrorAlert(alertMessage: string) {
+        AlertMessage.addAlert("danger", "An error occured", alertMessage);
+	}
+
+    getAlertMessages() {
+        return AlertMessage.alerts;
+    }
+}
diff --git a/pollor.client/src/app/app-routing.module.ts b/pollor.client/src/app/app-routing.module.ts
index 49b6658..67b49c5 100644
--- a/pollor.client/src/app/app-routing.module.ts
+++ b/pollor.client/src/app/app-routing.module.ts
@@ -2,10 +2,18 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { HomeComponent } from './home/home.component';
 import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
-import { PollsComponent } from './polls/component/polls.component';
+import { PollsComponent } from './polls/polls.component';
+import { UserLoginComponent } from './user-login/user-login.component';
+import { UserRegisterComponent } from './user-register/user-register.component';
+import { UserProfileComponent } from './user-profile/user-profile.component';
+import { UserAdminProfileComponent } from './user-admin-profile/user-admin-profile.component';
 
 const routes: Routes = [
   { path: '', component: HomeComponent },
+  { path: 'account/login', component: UserLoginComponent },
+  { path: 'account/register', component: UserRegisterComponent },
+  { path: 'account/profile', component: UserProfileComponent },
+  { path: 'account/admin-profile', component: UserAdminProfileComponent },
   { path: 'polls', component: PollsComponent },
   { path: '**', component: PageNotFoundComponent },  // route for 404 page
 ];
diff --git a/pollor.client/src/app/app.component.css b/pollor.client/src/app/app.component.css
index 7a4fe7e..0078b1c 100644
--- a/pollor.client/src/app/app.component.css
+++ b/pollor.client/src/app/app.component.css
@@ -1,6 +1,5 @@
 :host {
     max-width: 1280px;
-    padding: 2rem;
     text-align: center;
 }
 
@@ -16,3 +15,13 @@ th, td {
     padding-left: 1rem;
     padding-right: 1rem;
 }
+
+#page-container {
+    position: relative;
+    min-height: 100vh;
+  }
+  
+#content-wrap {
+    padding: 2.5rem;
+    padding-bottom: 12.5rem;            /* Footer height, must be same or higher as in footer.component.css */
+}
\ No newline at end of file
diff --git a/pollor.client/src/app/app.component.html b/pollor.client/src/app/app.component.html
index 20c39af..54f0477 100644
--- a/pollor.client/src/app/app.component.html
+++ b/pollor.client/src/app/app.component.html
@@ -1,5 +1,8 @@
-<app-header></app-header>
-
-<router-outlet></router-outlet>
-
-<app-footer></app-footer>
+<div id="page-container">
+    <app-header></app-header>
+    <div id="content-wrap">
+        <router-outlet></router-outlet>
+    </div>
+    <ngbd-alert-message></ngbd-alert-message>
+    <app-footer></app-footer>
+</div>
\ No newline at end of file
diff --git a/pollor.client/src/app/app.module.ts b/pollor.client/src/app/app.module.ts
index baa9450..42312b5 100644
--- a/pollor.client/src/app/app.module.ts
+++ b/pollor.client/src/app/app.module.ts
@@ -1,17 +1,25 @@
-import { HttpClientModule } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { AuthInterceptor } from '../services/auth.interceptor';
 import { HeaderComponent } from './header/header.component';
 import { FooterComponent } from './footer/footer.component';
 import { HomeComponent } from './home/home.component';
 import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { PollsComponent } from './polls/component/polls.component';
+import { PollsComponent } from './polls/polls.component';
+import { UserProfileComponent } from './user-profile/user-profile.component';
+import { UserLoginComponent } from './user-login/user-login.component';
+import { UserRegisterComponent } from './user-register/user-register.component';
+import { AlertMessage } from './alert-message/alert-message';
+import { UserAdminProfileComponent } from './user-admin-profile/user-admin-profile.component';
 
 @NgModule({
   declarations: [
@@ -19,19 +27,33 @@ import { PollsComponent } from './polls/component/polls.component';
     HeaderComponent,
     HomeComponent,
     PageNotFoundComponent,
-    PollsComponent
+    PollsComponent,
+    UserProfileComponent,
+    UserLoginComponent,
+    UserRegisterComponent,
+    UserAdminProfileComponent
   ],
   imports: [
-    BrowserModule, HttpClientModule,
+    BrowserModule,
+    RouterModule,
+    HttpClientModule,
+    FormsModule,
+    ReactiveFormsModule,
     AppRoutingModule,
     NgbModule,
     RouterOutlet,
     RouterLink,
     RouterLinkActive,
-    FontAwesomeModule,
-    FooterComponent
+    FooterComponent,
+    AlertMessage
+  ],
+  providers: [
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: AuthInterceptor,
+      multi: true,
+    }
   ],
-  providers: [],
   bootstrap: [AppComponent]
 })
 export class AppModule { }
diff --git a/pollor.client/src/app/footer/footer.component.css b/pollor.client/src/app/footer/footer.component.css
index 82fd693..041b5d0 100644
--- a/pollor.client/src/app/footer/footer.component.css
+++ b/pollor.client/src/app/footer/footer.component.css
@@ -2,6 +2,6 @@
   position: absolute;
   bottom: 0;
   width: 100%;
-  /* Set the fixed height of the footer here */
-  background-color: #f5f5f5;
-}
+  height: 10rem;            /* Footer height, must be same or lower as in app.component.css */
+  z-index: 50;
+}
\ No newline at end of file
diff --git a/pollor.client/src/app/footer/footer.component.html b/pollor.client/src/app/footer/footer.component.html
index 383f6df..a70c55a 100644
--- a/pollor.client/src/app/footer/footer.component.html
+++ b/pollor.client/src/app/footer/footer.component.html
@@ -10,8 +10,8 @@
            href="#!"
            role="button"
            data-mdb-ripple-color="dark">
-          <fa-icon [icon]="faLinkedin"></fa-icon>
-        </a>
+           <i class="bi bi-linkedin" style="font-size: 2rem;"></i>
+          </a>
 
         <!-- Github -->
         <a data-mdb-ripple-init
@@ -19,7 +19,7 @@
            href="#!"
            role="button"
            data-mdb-ripple-color="dark">
-          <fa-icon [icon]="faGithub"></fa-icon>
+          <i class="bi bi-github" style="font-size: 2rem;"></i>
         </a>
       </section>
       <!-- Section: Social media -->
diff --git a/pollor.client/src/app/footer/footer.component.ts b/pollor.client/src/app/footer/footer.component.ts
index 1e04a22..f043e96 100644
--- a/pollor.client/src/app/footer/footer.component.ts
+++ b/pollor.client/src/app/footer/footer.component.ts
@@ -1,18 +1,11 @@
 import { Component } from '@angular/core';
 import { environment } from './../../environments/environment';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { faLinkedin, faGithub } from '@fortawesome/free-brands-svg-icons';
-
 @Component({
   selector: 'app-footer',
   standalone: true,
-  imports: [FontAwesomeModule],
   templateUrl: './footer.component.html',
   styleUrl: './footer.component.css'
 })
 export class FooterComponent {
   public appVersion: String = environment.appVersion;
-  
-  faLinkedin = faLinkedin
-  faGithub = faGithub
 }
diff --git a/pollor.client/src/app/header/header.component.css b/pollor.client/src/app/header/header.component.css
index e69de29..6add56e 100644
--- a/pollor.client/src/app/header/header.component.css
+++ b/pollor.client/src/app/header/header.component.css
@@ -0,0 +1,27 @@
+nav {
+  background-color: seagreen;
+}
+
+a.nav-link.active {
+  background-color: white;
+  color: black !important;
+}
+
+a.nav-link:hover {
+  background-color: white;
+  color: black !important;
+}
+
+.dropdown-menu {
+  min-width: 200px;
+}
+
+@media screen and (max-width:767px) {
+  .nav-pills > li {
+    width: 100%;
+  }
+
+  .btn-group {
+    margin-left: auto;
+  }
+}
diff --git a/pollor.client/src/app/header/header.component.html b/pollor.client/src/app/header/header.component.html
index f2f37b3..694308c 100644
--- a/pollor.client/src/app/header/header.component.html
+++ b/pollor.client/src/app/header/header.component.html
@@ -1,28 +1,101 @@
-<nav class="navbar navbar-expand-lg bg-body-tertiary">
+<nav class="navbar navbar-expand-lg">
   <div class="container-fluid">
     <a class="navbar-brand" routerLink="">
-      <h1>
+      <h1 class="text-white">
         Pollor
         <img src="/assets/img/logo.svg" alt="Logo of Pollor" height="50">
       </h1>
-      <span>The Anonymous Voting System</span>
+      <span class="text-white">The Anonymous Voting System</span>
     </a>
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-        <li class="nav-item">
-          <a class="nav-link" aria-current="page" routerLink="">Home</a>
+      <ul class="nav nav-pills me-auto mb-2 mb-lg-0">
+        <li class="nav-item me-3">
+          <a class="nav-link text-light" aria-current="page" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}" routerLink="">Home</a>
         </li>
-        <li class="nav-item">
-          <a class="nav-link" aria-current="page" routerLink="polls">All Polls</a>
+        <li class="nav-item me-3">
+          <a class="nav-link text-light" aria-current="page" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}" routerLink="polls">All Polls</a>
         </li>
       </ul>
-      <form class="d-flex" role="search">
-        <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search" disabled>
-        <button class="btn btn-outline-success" type="submit" disabled>Search</button>
+      <form class="d-flex p-3" role="search">
+        <input class="form-control me-2" type="search" placeholder="Search in polls" aria-label="Search" disabled readonly>
+        <button class="btn btn-light" type="submit" disabled readonly>Search</button>
       </form>
+      <div class="d-flex p-3" role="search">
+        <!-- User options dropdown -->
+        <div class="btn-group">
+          <button type="button" class="btn btn-dark dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+            User actions
+          </button>
+          <ul class="dropdown-menu dropdown-menu-end w-100 p-2">
+            <!-- User Login -->
+            <li *ngIf="!isLoggedIn()" class="mb-1">
+              <a data-mdb-ripple-init
+                 routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}" 
+                 class="btn btn-outline-dark btn-block w-100"
+                 routerLink="account/login"
+                 role="button"
+                 data-mdb-ripple-color="dark">
+                <i class="bi bi-person-lock" style="font-size: 20px;"></i>
+                  Login
+              </a>
+            </li>
+            <!-- User Register -->
+            <li *ngIf="!isLoggedIn()" class="mb-1">
+              <a data-mdb-ripple-init
+                 routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}"
+                 class="btn btn-outline-dark btn-block w-100"
+                 routerLink="account/register"
+                 role="button"
+                 data-mdb-ripple-color="dark">
+                <i class="bi bi-person-plus" style="font-size: 20px;"></i>
+                Register
+              </a>
+            </li>
+            <!-- User Profile -->
+            <li *ngIf="isLoggedIn()" class="mb-1">
+              <a data-mdb-ripple-init
+                 routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}"
+                 class="btn btn-outline-dark btn-block w-100"
+                 routerLink="account/profile"
+                 role="button"
+                 data-mdb-ripple-color="dark">
+                <i class="bi bi-person-gear" style="font-size: 20px;"></i>
+                User Profile
+              </a>
+            </li>
+            <!-- Admin Profile -->
+            <li *ngIf="isLoggedIn() && isAdmin()" class="mb-1">
+              <a data-mdb-ripple-init
+                 routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}"
+                 class="btn btn-outline-dark btn-block w-100"
+                 routerLink="account/admin-profile"
+                 role="button"
+                 data-mdb-ripple-color="dark">
+                <i class="bi bi-person-gear" style="font-size: 20px;"></i>
+                Admin Profile
+              </a>
+            </li>
+            <li *ngIf="isLoggedIn()">
+              <hr class="dropdown-divider">
+            </li>
+            <!-- Logout -->
+            <li *ngIf="isLoggedIn()" class="mb-1">
+              <a data-mdb-ripple-init
+                 routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}"
+                 class="btn btn-outline-dark btn-block w-100"
+                 routerLink="account/logout"
+                 role="button"
+                 data-mdb-ripple-color="dark">
+                <i class="bi bi-door-closed" style="font-size: 20px;"></i>
+                Logout
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
     </div>
   </div>
 </nav>
diff --git a/pollor.client/src/app/header/header.component.ts b/pollor.client/src/app/header/header.component.ts
index 5051cf8..873243a 100644
--- a/pollor.client/src/app/header/header.component.ts
+++ b/pollor.client/src/app/header/header.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { AuthService } from '../../services/auth.service';
 
 @Component({
   selector: 'app-header',
@@ -7,4 +8,11 @@ import { Component } from '@angular/core';
 })
 export class HeaderComponent {
 
+  isAdmin(): boolean {
+    return AuthService.getRole().toLowerCase() == "admin";
+  }
+
+  isLoggedIn(): boolean {
+    return AuthService.isLoggedIn();
+  }
 }
diff --git a/pollor.client/src/app/home/home.component.ts b/pollor.client/src/app/home/home.component.ts
index 152dafe..fe23cc3 100644
--- a/pollor.client/src/app/home/home.component.ts
+++ b/pollor.client/src/app/home/home.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ApiService } from '../services/api.service';
+import { ApiService } from '../../services/api.service';
 
 @Component({
   selector: 'app-home',
diff --git a/pollor.client/src/app/polls/component/polls.component.css b/pollor.client/src/app/polls/polls.component.css
similarity index 100%
rename from pollor.client/src/app/polls/component/polls.component.css
rename to pollor.client/src/app/polls/polls.component.css
diff --git a/pollor.client/src/app/polls/component/polls.component.html b/pollor.client/src/app/polls/polls.component.html
similarity index 94%
rename from pollor.client/src/app/polls/component/polls.component.html
rename to pollor.client/src/app/polls/polls.component.html
index 5f6d060..a263d66 100644
--- a/pollor.client/src/app/polls/component/polls.component.html
+++ b/pollor.client/src/app/polls/polls.component.html
@@ -2,7 +2,7 @@
 
 <h3 id="tableLabel" text-right>Polls</h3>
 
-<p *ngIf="!pollsLoaded"><em>Loading POLLS...</em></p>
+<p *ngIf="!pollsLoaded"><em [style.color]="pollLoadingColor">{{ pollLoadingMsg }}</em></p>
 
 <p *ngIf="pollsLoaded && polls.length == 0"><em>no poll data found</em></p>
 
diff --git a/pollor.client/src/app/polls/component/polls.component.spec.ts b/pollor.client/src/app/polls/polls.component.spec.ts
similarity index 100%
rename from pollor.client/src/app/polls/component/polls.component.spec.ts
rename to pollor.client/src/app/polls/polls.component.spec.ts
diff --git a/pollor.client/src/app/polls/component/polls.component.ts b/pollor.client/src/app/polls/polls.component.ts
similarity index 54%
rename from pollor.client/src/app/polls/component/polls.component.ts
rename to pollor.client/src/app/polls/polls.component.ts
index 229291e..4da73a9 100644
--- a/pollor.client/src/app/polls/component/polls.component.ts
+++ b/pollor.client/src/app/polls/polls.component.ts
@@ -1,9 +1,8 @@
 import { Component } from '@angular/core';
 import { ApiService } from '../../services/api.service';
-import { IPolls } from '../polls.interface';
-import { IAnswers } from '../answers.interface';
-import { IVotes } from '../votes.interface';
+import { IPolls } from '../../interfaces/polls.interface';
 
+import { AlertMessage } from '../alert-message/alert-message';
 
 @Component({
   selector: 'app-polls',
@@ -14,6 +13,8 @@ export class PollsComponent {
   public polls: IPolls[] = [];
 
   public pollsLoaded: boolean = false;
+  public pollLoadingMsg: string = "Loading polls...";
+  public pollLoadingColor: string = "";
 
   constructor(private apiService: ApiService) { }
 
@@ -22,13 +23,18 @@ export class PollsComponent {
   }
 
   getPolls() {
-    this.apiService.get<IPolls[]>('polls')
+    this.apiService.get<IPolls[]>('api/polls')
       .subscribe({
         next: (response) => {
           this.polls = response;
           this.pollsLoaded = true;
         },
-        error: (error) => console.error(error),
+        error: (err) => {
+          this.pollLoadingMsg = err.status + ' - ' + err.error.message;
+          this.pollLoadingColor = "red";
+          console.error(err);
+          AlertMessage.addErrorAlert(err.error.message);
+        },
         //complete: () => { }
       });
   }
diff --git a/pollor.client/src/app/user-admin-profile/user-admin-profile.component.css b/pollor.client/src/app/user-admin-profile/user-admin-profile.component.css
new file mode 100644
index 0000000..0c94e4e
--- /dev/null
+++ b/pollor.client/src/app/user-admin-profile/user-admin-profile.component.css
@@ -0,0 +1,4 @@
+.card {
+  max-width: 600px;
+  margin: 0 auto;
+}
diff --git a/pollor.client/src/app/user-admin-profile/user-admin-profile.component.html b/pollor.client/src/app/user-admin-profile/user-admin-profile.component.html
new file mode 100644
index 0000000..a9458c0
--- /dev/null
+++ b/pollor.client/src/app/user-admin-profile/user-admin-profile.component.html
@@ -0,0 +1,6 @@
+<div>
+  <h4>Admin Page</h4>
+</div>
+
+
+<app-user-profile></app-user-profile>
diff --git a/pollor.client/src/app/user-admin-profile/user-admin-profile.component.spec.ts b/pollor.client/src/app/user-admin-profile/user-admin-profile.component.spec.ts
new file mode 100644
index 0000000..1bfea6d
--- /dev/null
+++ b/pollor.client/src/app/user-admin-profile/user-admin-profile.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserAdminProfileComponent } from './user-admin-profile.component';
+
+describe('UserAdminProfileComponent', () => {
+  let component: UserAdminProfileComponent;
+  let fixture: ComponentFixture<UserAdminProfileComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [UserAdminProfileComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(UserAdminProfileComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/pollor.client/src/app/user-admin-profile/user-admin-profile.component.ts b/pollor.client/src/app/user-admin-profile/user-admin-profile.component.ts
new file mode 100644
index 0000000..caf64a0
--- /dev/null
+++ b/pollor.client/src/app/user-admin-profile/user-admin-profile.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-user-admin-profile',
+  templateUrl: './user-admin-profile.component.html',
+  styleUrl: './user-admin-profile.component.css'
+})
+export class UserAdminProfileComponent {
+
+}
diff --git a/pollor.client/src/app/user-login/user-login.component.css b/pollor.client/src/app/user-login/user-login.component.css
new file mode 100644
index 0000000..aaaf20c
--- /dev/null
+++ b/pollor.client/src/app/user-login/user-login.component.css
@@ -0,0 +1,4 @@
+.card {
+    max-width: 600px;
+    margin: 0 auto;
+}
diff --git a/pollor.client/src/app/user-login/user-login.component.html b/pollor.client/src/app/user-login/user-login.component.html
new file mode 100644
index 0000000..7ff9365
--- /dev/null
+++ b/pollor.client/src/app/user-login/user-login.component.html
@@ -0,0 +1,33 @@
+<div class="card">
+    <h5 class="card-header p-3">Login to POLLOR</h5>
+    <div class="card-body p-4">
+        <form [formGroup]="loginForm" (ngSubmit)="loginForm.valid && sendLogin()" class="container card-text">
+            <br />
+            <div class="form-group form-floating mb-3">
+                <input formControlName="username" type="text" placeholder="Username" class="form-control" id="floatingInput">
+                <label for="floatingInput">Username</label>
+            </div>
+            <div class="form-group form-floating mb-3">
+                <input formControlName="password" type="password" placeholder="Password" class="form-control" id="floatingPassword">
+                <label for="floatingPassword">Password</label>
+            </div>
+            <div class="form-group form-check mb-3">
+                <input formControlName="tokenLongerValid" type="checkbox" class="form-check-input" id="longLoggedin">
+                <label class="form-check-label" for="longLoggedin">
+                    Stay loggedin for 30 days
+                </label>
+            </div>
+            <br />
+            <div *ngIf="!loading">
+                <input type="submit" value="Login" class="btn btn-primary" />
+            </div>
+            <div *ngIf="loading" >
+                <button class="btn btn-primary" type="button" disabled>
+                    <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+                    Loading...
+                </button>
+            </div>
+        </form>
+        {{ loginError }}
+    </div>
+</div>
diff --git a/pollor.client/src/app/user-login/user-login.component.spec.ts b/pollor.client/src/app/user-login/user-login.component.spec.ts
new file mode 100644
index 0000000..900c4d9
--- /dev/null
+++ b/pollor.client/src/app/user-login/user-login.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserLoginComponent } from './user-login.component';
+
+describe('UserLoginComponent', () => {
+  let component: UserLoginComponent;
+  let fixture: ComponentFixture<UserLoginComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [UserLoginComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(UserLoginComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/pollor.client/src/app/user-login/user-login.component.ts b/pollor.client/src/app/user-login/user-login.component.ts
new file mode 100644
index 0000000..91928e6
--- /dev/null
+++ b/pollor.client/src/app/user-login/user-login.component.ts
@@ -0,0 +1,95 @@
+import { Component } from '@angular/core';
+import { AuthService } from '../../services/auth.service';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { finalize } from 'rxjs/operators';
+import { AlertMessage } from '../alert-message/alert-message';
+
+@Component({
+  selector: 'app-user-login',
+  templateUrl: './user-login.component.html',
+  styleUrl: './user-login.component.css'
+})
+export class UserLoginComponent {
+  loginError: string = '';
+  loading: boolean = false;
+  loginForm: FormGroup;
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private authService: AuthService,
+    private router: Router
+  ) {
+    this.loginForm = formBuilder.group({
+      username: ["", Validators.required],
+      password: ["", Validators.required],
+      tokenLongerValid: [false, Validators.required]
+    });
+
+    const token = localStorage.getItem('token');
+    const role = localStorage.getItem('role');
+
+    if (token && role) {
+      console.log("validate user");
+      this.validateUser(); // validate and navigate to role profile page
+    }
+  }
+
+  sendLogin(): void {
+    if (this.loginForm.valid) {
+      this.loading = true; // Start the loading spinner
+      this.authService
+        .login(this.loginForm.value)
+        .pipe(
+          finalize(() => {
+            this.loading = false; //Stop the loading spinner
+          })
+        )
+        .subscribe({
+          next: (res: any) => {
+            console.log('Response:', res);
+            localStorage.setItem('token', res.token);
+            localStorage.setItem('role', res.user.role);
+            this.loginError = '';
+            this.loginForm.reset();
+            this.navigateDashboard(res.user.role);
+            AlertMessage.addSuccessAlert("Login is successfull !");
+          },
+          error: (err: any) => {
+            this.loginError = err.error.message;
+            console.error('Login Error:', err);
+            AlertMessage.addErrorAlert(err.error.message);
+          },
+        });
+    }
+  }
+
+  validateUser(): any {
+    this.loading = true; // Start the loading spinner
+    this.authService
+      .validateToken()
+      .pipe(
+        finalize(() => {
+          this.loading = false; //Stop the loading spinner
+        })
+      )
+      .subscribe({
+        next: (res: any) => {
+          console.log('Response:', res);
+          this.navigateDashboard(res.user.role);
+        },
+        error: (err: any) => {
+          this.loginError = err.error.message;
+          console.error('Token validation Error:', err);
+          AlertMessage.addErrorAlert(err.error.message);
+        },
+      });
+  }
+
+  navigateDashboard(role: string): void {
+    const dashboardRoute =
+      role === 'admin' ? '/account/admin-profile' : '/account/profile';
+    this.router.navigate([dashboardRoute]);
+    console.log(`${role} dashboard route`);
+  }
+}
diff --git a/pollor.client/src/app/user-profile/user-profile.component.css b/pollor.client/src/app/user-profile/user-profile.component.css
new file mode 100644
index 0000000..0c94e4e
--- /dev/null
+++ b/pollor.client/src/app/user-profile/user-profile.component.css
@@ -0,0 +1,4 @@
+.card {
+  max-width: 600px;
+  margin: 0 auto;
+}
diff --git a/pollor.client/src/app/user-profile/user-profile.component.html b/pollor.client/src/app/user-profile/user-profile.component.html
new file mode 100644
index 0000000..00e5d78
--- /dev/null
+++ b/pollor.client/src/app/user-profile/user-profile.component.html
@@ -0,0 +1,52 @@
+<div>
+  <div class="card">
+    <h5 class="card-header p-3">User profile</h5>
+    <div class="card-body p-4">
+      <form [formGroup]="editUserForm" (ngSubmit)="editUserForm.valid && editUser()" class="container card-text">
+        <br />
+        <div class="form-group form-floating mb-3">
+          <input class="form-control" type="text" value="{{ user.role }}" id="floatingRoleInput" disabled readonly>
+          <label for="floatingRoleInput">Role</label>
+        </div>
+        <div class="form-group form-floating mb-3">
+          <input class="form-control" type="text" value="{{ user.created_at }}" id="floatingCreatedatInput" disabled readonly>
+          <label for="floatingCreatedatInput">Joined at</label>
+        </div>
+        <div class="form-group form-floating mb-3">
+          <input class="form-control" type="text" value="{{ user.username }}" id="floatingUsernameInput" disabled readonly>
+          <label for="floatingUsernameInput">Username</label>
+        </div>
+        <div class="form-group form-floating mb-3">
+          <input class="form-control" type="text" value="{{ user.emailaddress }}" id="floatingEmailaddressInput" disabled readonly>
+          <label for="floatingEmailaddressInput">Emailaddress</label>
+        </div>
+        <div class="row">
+          <div class="col-6">
+            <div class="form-group form-floating mb-3">
+              <input class="form-control" type="text" value="{{ user.first_name }}" id="floatingFirstnameInput" disabled readonly>
+              <label for="floatingFirstnameInput">First name</label>
+            </div>
+          </div>
+          <div class="col-6">
+            <div class="form-group form-floating mb-3">
+              <input class="form-control" type="text" value="{{ user.last_name }}" id="floatingLastnameInput" disabled readonly>
+              <label for="floatingLastnameInput">Last name</label>
+            </div>
+          </div>
+        </div>
+        <br />
+        <div *ngIf="userLoaded">
+          <input type="submit" value="Update" class="btn btn-primary" />
+        </div>
+        <div *ngIf="!userLoaded">
+          <button class="btn btn-primary" type="button" disabled>
+            <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+            Loading...
+          </button>
+        </div>
+      </form>
+      {{ profileEditError }}
+    </div>
+  </div>
+
+</div>
diff --git a/pollor.client/src/app/user-profile/user-profile.component.spec.ts b/pollor.client/src/app/user-profile/user-profile.component.spec.ts
new file mode 100644
index 0000000..9a8110b
--- /dev/null
+++ b/pollor.client/src/app/user-profile/user-profile.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserProfileComponent } from './user-profile.component';
+
+describe('UserProfileComponent', () => {
+  let component: UserProfileComponent;
+  let fixture: ComponentFixture<UserProfileComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [UserProfileComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(UserProfileComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/pollor.client/src/app/user-profile/user-profile.component.ts b/pollor.client/src/app/user-profile/user-profile.component.ts
new file mode 100644
index 0000000..fb65bc9
--- /dev/null
+++ b/pollor.client/src/app/user-profile/user-profile.component.ts
@@ -0,0 +1,70 @@
+import { Component } from '@angular/core';
+import { IUser } from '../../interfaces/user.interface';
+import { ApiService } from '../../services/api.service';
+import { AlertMessage } from '../alert-message/alert-message';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { AuthService } from '../../services/auth.service';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'app-user-profile',
+  templateUrl: './user-profile.component.html',
+  styleUrl: './user-profile.component.css'
+})
+export class UserProfileComponent {
+  public user: IUser = {
+      id: 0,
+      username: '',
+      emailaddress: '',
+      first_name: '',
+      last_name: '',
+      role: '',
+      created_at: new Date(),
+      polls: []
+  };
+
+  public userLoaded: boolean = false;
+  public userLoadingMsg: string = "Loading polls...";
+  public profileEditError: string = '';
+  public editUserForm: FormGroup;
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private authService: AuthService,
+    private router: Router,
+    private apiService: ApiService
+  ) {
+    this.editUserForm = formBuilder.group({
+      username: ["", Validators.required],
+      emailaddress: ["", Validators.required],
+      first_name: ["", Validators.required],
+      last_name: ["", Validators.required]
+    });
+  }
+
+  ngOnInit() {
+    this.getUser();
+  }
+
+  getUser() {
+    this.apiService.get<IUser>('api/user')
+      .subscribe({
+        next: (response) => {
+          this.user = response;
+          console.log(this.user);
+
+          this.userLoaded = true;
+        },
+        error: (err) => {
+          this.userLoadingMsg = err.status + ' - ' + err.error.message;
+          console.error(err);
+          AlertMessage.addErrorAlert(err.error.message);
+        },
+        //complete: () => { }
+      });
+  }
+
+  editUser() {
+
+  }
+}
diff --git a/pollor.client/src/app/user-register/user-register.component.css b/pollor.client/src/app/user-register/user-register.component.css
new file mode 100644
index 0000000..0c94e4e
--- /dev/null
+++ b/pollor.client/src/app/user-register/user-register.component.css
@@ -0,0 +1,4 @@
+.card {
+  max-width: 600px;
+  margin: 0 auto;
+}
diff --git a/pollor.client/src/app/user-register/user-register.component.html b/pollor.client/src/app/user-register/user-register.component.html
new file mode 100644
index 0000000..1da2985
--- /dev/null
+++ b/pollor.client/src/app/user-register/user-register.component.html
@@ -0,0 +1,94 @@
+<div class="card">
+  <h5 class="card-header p-3">Register your account for POLLOR</h5>
+  <div class="card-body p-4">
+    <form [formGroup]="registerForm" (ngSubmit)="registerForm.valid && sendRegister()" class="container card-text" novalidate>
+      <br />
+
+      <!-- Emailaddress -->
+      <div class="form-group form-floating mb-3">
+        <input formControlName="emailaddress" type="email" placeholder="Emailaddress" class="form-control" id="floatingEmailInput">
+        <label for="floatingEmailInput">Emailaddress</label>
+        <!-- Emailaddress validation -->
+        <div *ngIf="getEmailaddress.invalid && (getEmailaddress.dirty || getEmailaddress.touched)" class="alert alert-danger">
+          <div *ngIf="getEmailaddress.errors?.required">
+            Emailaddress is required.
+          </div>
+          <div *ngIf="getEmailaddress.errors?.pattern">
+            Should be an emailaddress
+          </div>
+        </div>
+      </div>
+
+      <!-- Username -->
+      <div class="form-group form-floating mb-3">
+        <input formControlName="username" type="text" placeholder="Username" class="form-control" id="floatingUsernameInput">
+        <label for="floatingUsernameInput">Username</label>
+        <!-- Username validation -->
+        <div *ngIf="getUsername.invalid && (getUsername.dirty || getUsername.touched)" class="alert alert-danger">
+          <div *ngIf="getUsername.errors?.required">
+            Username is required.
+          </div>
+          <div *ngIf="getUsername.errors?.minlength">
+            Minimal length should be 4.
+          </div>
+        </div>
+      </div>
+
+      <!-- Password -->
+      <div class="input-group has-validation mb-3">
+        <div class="form-group form-floating">
+          <input formControlName="password" type="password" placeholder="Password" class="form-control" id="floatingPassword">
+          <label for="floatingPassword">Password</label>
+          <!-- Password validation -->
+          <div *ngIf="getPassword.invalid && (getPassword.dirty || getPassword.touched)" class="alert alert-danger">
+            <div *ngIf="getPassword.errors?.required">
+              Password is required.
+            </div>
+            <div *ngIf="getPassword.errors?.minlength">
+              Minimal length should be 8.
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- Confirm Password -->
+      <div class="input-group has-validation mb-3">
+        <div class="form-group form-floating">
+          <input formControlName="confirmPassword" type="password" placeholder="Password" class="form-control" id="floatingConfirmPassword">
+          <label for="floatingConfirmPassword">Password</label>
+          <!-- Confirm Password validation -->
+          <div *ngIf="getConfirmPassword.invalid && (getConfirmPassword.dirty || getConfirmPassword.touched)" class="alert alert-danger">
+            <div *ngIf="getConfirmPassword.errors?.required">
+              Password is required.
+            </div>
+            <div *ngIf="getConfirmPassword.errors?.minlength">
+              Minimal length should be 8.
+            </div>
+            <div *ngIf="getConfirmPassword.errors?.confirmedValidator">
+              Passwords don't match.
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <br />
+      <div *ngIf="!loading && registerForm.status == 'VALID'">
+        <input type="submit" value="Register Account" class="btn btn-primary" />
+      </div>
+      <div *ngIf="loading">
+        <button class="btn btn-primary" type="button" disabled>
+          <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+          Loading...
+        </button>
+      </div>
+      <div *ngIf="registerForm.status != 'VALID'">
+        <button class="btn btn-primary" type="button" disabled>
+          <span class="" role="status" aria-hidden="true"></span>
+          Register Account
+        </button>
+      </div>
+
+    </form>
+    {{ registerError }}
+  </div>
+</div>
diff --git a/pollor.client/src/app/user-register/user-register.component.spec.ts b/pollor.client/src/app/user-register/user-register.component.spec.ts
new file mode 100644
index 0000000..8ba536d
--- /dev/null
+++ b/pollor.client/src/app/user-register/user-register.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserRegisterComponent } from './user-register.component';
+
+describe('UserRegisterComponent', () => {
+  let component: UserRegisterComponent;
+  let fixture: ComponentFixture<UserRegisterComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [UserRegisterComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(UserRegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/pollor.client/src/app/user-register/user-register.component.ts b/pollor.client/src/app/user-register/user-register.component.ts
new file mode 100644
index 0000000..b9d830c
--- /dev/null
+++ b/pollor.client/src/app/user-register/user-register.component.ts
@@ -0,0 +1,122 @@
+import { Component } from '@angular/core';
+import { AuthService } from '../../services/auth.service';
+import { AbstractControl, FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { finalize } from 'rxjs/operators';
+import { AlertMessage } from '../alert-message/alert-message';
+
+@Component({
+  selector: 'app-user-register',
+  templateUrl: './user-register.component.html',
+  styleUrl: './user-register.component.css'
+})
+export class UserRegisterComponent {
+  registerError: string = '';
+  loading: boolean = false;
+  registerForm: FormGroup;
+  regexEmail = new RegExp(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/);
+
+  constructor(
+    private fb: FormBuilder,
+    private authService: AuthService,
+    private router: Router) {
+    this.registerForm = this.fb.group({
+      emailaddress: new FormControl(null, [Validators.required, Validators.pattern(this.regexEmail)]),
+      username: new FormControl(null, [Validators.required, Validators.minLength(4)]),
+      password: new FormControl(null, [Validators.required, Validators.minLength(8)]),
+      confirmPassword: new FormControl(null, [Validators.required, Validators.minLength(8)])
+    },
+    {
+      validator: this.ConfirmedValidator('password', 'confirmPassword'),
+    });
+
+    const token = localStorage.getItem('token');
+    const role = localStorage.getItem('role');
+
+    if (token && role) {
+      console.log("validate user");
+      this.validateUser(); // validate and navigate to role profile page
+    }
+  }
+
+  get getEmailaddress(): AbstractControl  { return this.registerForm.get('emailaddress')!; }
+  get getUsername(): AbstractControl { return this.registerForm.get('username')!; }
+  get getPassword(): AbstractControl  { return this.registerForm.get('password')!; }
+  get getConfirmPassword(): AbstractControl  { return this.registerForm.get('confirmPassword')!; }
+
+  sendRegister(): void {
+    if (this.registerForm.valid) {
+      this.loading = true; // Start the loading spinner
+      this.authService
+        .register(this.registerForm.value)
+        .pipe(
+          finalize(() => {
+            this.loading = false; //Stop the loading spinner
+          })
+        )
+        .subscribe({
+          next: (res: any) => {
+            console.log('Response:', res);
+            localStorage.setItem('token', res.token);
+            localStorage.setItem('role', res.user.role);
+            this.registerError = '';
+            this.registerForm.reset();
+            this.navigateDashboard(res.user.role);
+            AlertMessage.addSuccessAlert("Account registration is successfull !");
+          },
+          error: (err: any) => {
+            this.registerError = err.error.message;
+            console.error('Login Error:', err);
+            AlertMessage.addErrorAlert(err.error.message);
+          },
+        });
+    }
+  }
+
+  validateUser(): any {
+    this.loading = true; // Start the loading spinner
+    this.authService
+      .validateToken()
+      .pipe(
+        finalize(() => {
+          this.loading = false; //Stop the loading spinner
+        })
+      )
+      .subscribe({
+        next: (res: any) => {
+          console.log('Response:', res);
+          this.navigateDashboard(res.user.role);
+        },
+        error: (err: any) => {
+          this.registerError = err.error.message;
+          console.error('Token validation Error:', err);
+          AlertMessage.addErrorAlert(err.error.message);
+        },
+      });
+  }
+
+  navigateDashboard(role: string): void {
+    const dashboardRoute =
+      role === 'admin' ? '/account/admin-profile' : '/account/profile';
+    this.router.navigate([dashboardRoute]);
+    console.log(`${role} dashboard route`);
+  }
+
+  ConfirmedValidator(controlName: string, matchingControlName: string) {
+    return (formGroup: FormGroup) => {
+      const control = formGroup.controls[controlName];
+      const matchingControl = formGroup.controls[matchingControlName];
+      if (
+        matchingControl.errors &&
+        !matchingControl.errors.confirmedValidator
+      ) {
+        return;
+      }
+      if (control.value !== matchingControl.value) {
+        matchingControl.setErrors({ confirmedValidator: true });
+      } else {
+        matchingControl.setErrors(null);
+      }
+    };
+  }
+}
diff --git a/pollor.client/src/app/polls/answers.interface.ts b/pollor.client/src/interfaces/answers.interface.ts
similarity index 100%
rename from pollor.client/src/app/polls/answers.interface.ts
rename to pollor.client/src/interfaces/answers.interface.ts
diff --git a/pollor.client/src/interfaces/auth.interface.ts b/pollor.client/src/interfaces/auth.interface.ts
new file mode 100644
index 0000000..a357980
--- /dev/null
+++ b/pollor.client/src/interfaces/auth.interface.ts
@@ -0,0 +1,4 @@
+export interface IAuth {
+  token: string;
+  role: string;
+}
diff --git a/pollor.client/src/app/polls/polls.interface.ts b/pollor.client/src/interfaces/polls.interface.ts
similarity index 100%
rename from pollor.client/src/app/polls/polls.interface.ts
rename to pollor.client/src/interfaces/polls.interface.ts
diff --git a/pollor.client/src/interfaces/user.interface.ts b/pollor.client/src/interfaces/user.interface.ts
new file mode 100644
index 0000000..e8c4d4c
--- /dev/null
+++ b/pollor.client/src/interfaces/user.interface.ts
@@ -0,0 +1,19 @@
+import { IPolls } from "./polls.interface";
+
+export interface IUser {
+  id: number;
+  username: string;
+  emailaddress: string;
+  first_name: string;
+  last_name: string;
+  role: string;
+  created_at: Date;
+  polls: IPolls[];
+}
+
+export interface IUserChangePassword {
+  id: number;
+  username: string;
+  password: string;
+  confirm_password: string;
+}
diff --git a/pollor.client/src/app/polls/votes.interface.ts b/pollor.client/src/interfaces/votes.interface.ts
similarity index 100%
rename from pollor.client/src/app/polls/votes.interface.ts
rename to pollor.client/src/interfaces/votes.interface.ts
diff --git a/pollor.client/src/app/services/api.service.ts b/pollor.client/src/services/api.service.ts
similarity index 92%
rename from pollor.client/src/app/services/api.service.ts
rename to pollor.client/src/services/api.service.ts
index ee8c4b5..ae3b523 100644
--- a/pollor.client/src/app/services/api.service.ts
+++ b/pollor.client/src/services/api.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { environment } from '../../environments/environment';
+import { environment } from '../environments/environment';
 
 @Injectable({
   providedIn: 'root'
diff --git a/pollor.client/src/services/auth.interceptor.ts b/pollor.client/src/services/auth.interceptor.ts
new file mode 100644
index 0000000..e1161b1
--- /dev/null
+++ b/pollor.client/src/services/auth.interceptor.ts
@@ -0,0 +1,23 @@
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { AuthService } from './auth.service';
+
+@Injectable()
+export class AuthInterceptor implements HttpInterceptor {
+  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    if (AuthService.getToken()) {
+      const headers = {
+        'Content-Type': 'application/json; charset=utf-8',
+        'Accept': 'application/json',
+        'Authorization': `Bearer ${AuthService.getToken()}`,
+      };
+
+      req = req.clone({
+        setHeaders: headers,
+      });
+    }
+
+    return next.handle(req);
+  }
+}
diff --git a/pollor.client/src/services/auth.service.ts b/pollor.client/src/services/auth.service.ts
new file mode 100644
index 0000000..0fb3ff2
--- /dev/null
+++ b/pollor.client/src/services/auth.service.ts
@@ -0,0 +1,47 @@
+import { Observable } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { ApiService } from './api.service';
+import { HttpHeaders } from '@angular/common/http';
+import { IAuth } from '../interfaces/auth.interface';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AuthService {
+  constructor(private apiService: ApiService) {}
+
+  login<T>(body: any): Observable<T> {
+    return this.apiService.post<T>('api/auth/login', body);
+  }
+
+  register<T>(body: any): Observable<T> {
+    return this.apiService.post<T>('api/auth/register', body);
+  }
+
+  validateToken<T>(): Observable<T> {
+    const auth: IAuth = {
+      token: AuthService.getToken(),
+      role: AuthService.getRole()
+    }
+    return this.apiService.post<T>('api/auth/validate', auth);
+  }
+
+  logout<T>(body: any): Observable<T> {
+    return this.apiService.post<T>('api/auth/logout', body);
+  }
+
+  static getToken() : string {
+    return localStorage.getItem("token")!;
+  }
+
+  static getRole() : string {
+    return localStorage.getItem("role")!;
+  }
+
+  static isLoggedIn() : boolean {
+    if (this.getRole() && this.getToken()) {
+      return true;
+    }
+    return false;
+  }
+}
diff --git a/pollor.client/tsconfig.json b/pollor.client/tsconfig.json
index f37b67f..4f94e36 100644
--- a/pollor.client/tsconfig.json
+++ b/pollor.client/tsconfig.json
@@ -6,7 +6,7 @@
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
+    "noPropertyAccessFromIndexSignature": false,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
     "skipLibCheck": true,
diff --git a/pollor.sln b/pollor.sln
index 51f6912..aed91dc 100644
--- a/pollor.sln
+++ b/pollor.sln
@@ -11,9 +11,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "database", "database", "{98
 	ProjectSection(SolutionItems) = preProject
 		database\drop-tables.sql = database\drop-tables.sql
 		database\migration.sql = database\migration.sql
+		database\README.md = database\README.md
 		database\seed.sql = database\seed.sql
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9096682-FD32-481C-ACA9-8F8AE88BD0D6}"
+	ProjectSection(SolutionItems) = preProject
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		LICENSE.txt = LICENSE.txt
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU