diff --git a/Cicm.Database/Models/CompanyLogo.cs b/Cicm.Database/Models/CompanyLogo.cs
index 41cbcb86..44573d0a 100644
--- a/Cicm.Database/Models/CompanyLogo.cs
+++ b/Cicm.Database/Models/CompanyLogo.cs
@@ -29,17 +29,28 @@
 *******************************************************************************/
 
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.AspNetCore.Http;
 
 namespace Cicm.Database.Models
 {
     public class CompanyLogo : BaseModel<int>
     {
-        public int  CompanyId { get; set; }
+        public int CompanyId { get; set; }
         [Range(1000, 3000)]
-        public int? Year      { get; set; }
-        public Guid Guid      { get; set; }
+        public int? Year { get; set; }
+        public Guid Guid { get; set; }
 
         public virtual Company Company { get; set; }
+
+        [NotMapped]
+        [Required(ErrorMessage = "SVG logo required")]
+        [DisplayName("Upload SVG logo:")]
+        public IFormFile SvgLogo { get; set; }
+
+        [NotMapped]
+        public string ErrorMessage { get; set; }
     }
 }
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Controllers/CompanyLogosController.cs b/cicm_web/Areas/Admin/Controllers/CompanyLogosController.cs
index 5829516c..eeda402a 100644
--- a/cicm_web/Areas/Admin/Controllers/CompanyLogosController.cs
+++ b/cicm_web/Areas/Admin/Controllers/CompanyLogosController.cs
@@ -1,12 +1,19 @@
+using System;
+using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
+using System.Xml;
 using Cicm.Database.Models;
+using cicm_web.Areas.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
+using SkiaSharp;
+using SKSvg = SkiaSharp.Extended.Svg.SKSvg;
 
 namespace cicm_web.Areas.Admin.Controllers
 {
@@ -48,29 +55,222 @@ namespace cicm_web.Areas.Admin.Controllers
 
         // GET: CompanyLogos/Create
         // TODO: Upload
-        // public IActionResult Create()
-        // {
-        //     ViewData["CompanyId"] = new SelectList(_context.Companies, "Id", "Name");
-        //     return View();
-        // }
+        public IActionResult Create()
+        {
+            ViewData["CompanyId"] =
+                new
+                    SelectList(_context.Companies.Select(c => new CompanyViewModel {Name = c.Name, Id = c.Id}).OrderBy(c => c.Name),
+                               "Id", "Name");
+            return View();
+        }
 
         // POST: CompanyLogos/Create
         // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
         // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
         // TODO: Upload
-        // [HttpPost]
-        // [ValidateAntiForgeryToken]
-        // public async Task<IActionResult> Create([Bind("Id,CompanyId,Year,Guid")] CompanyLogo companyLogo)
-        // {
-        //     if (ModelState.IsValid)
-        //     {
-        //         _context.Add(companyLogo);
-        //         await _context.SaveChangesAsync();
-        //         return RedirectToAction(nameof(Index));
-        //     }
-        //     ViewData["CompanyId"] = new SelectList(_context.Companies, "Id", "Name", companyLogo.CompanyId);
-        //     return View(companyLogo);
-        // }
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> Create([Bind("Id,CompanyId,Year,SvgLogo")] CompanyLogo companyLogo)
+        {
+            if(!ModelState.IsValid)
+            {
+                ViewData["CompanyId"] =
+                    new
+                        SelectList(_context.Companies.Select(c => new CompanyViewModel {Name = c.Name, Id = c.Id}).OrderBy(c => c.Name),
+                                   "Id", "Name", companyLogo.CompanyId);
+                return View(companyLogo);
+            }
+
+            using(MemoryStream svgMs = new MemoryStream())
+            {
+                await companyLogo.SvgLogo.CopyToAsync(svgMs);
+
+                svgMs.Position = 0;
+
+                try
+                {
+                    StreamReader sr     = new StreamReader(svgMs, Encoding.UTF8);
+                    string       svgStr = await sr.ReadToEndAsync();
+                    XmlDocument  xml    = new XmlDocument();
+                    xml.LoadXml(svgStr);
+                }
+                catch(XmlException e)
+                {
+                    companyLogo.SvgLogo      = null;
+                    companyLogo.ErrorMessage = "Not a valid SVG file.";
+
+                    ViewData["CompanyId"] =
+                        new
+                            SelectList(_context.Companies.Select(c => new CompanyViewModel {Name = c.Name, Id = c.Id}).OrderBy(c => c.Name),
+                                       "Id", "Name", companyLogo.CompanyId);
+                    return View(companyLogo);
+                }
+
+                svgMs.Position   = 0;
+                companyLogo.Guid = Guid.NewGuid();
+
+                string vectorial = Path.Combine(hostingEnvironment.WebRootPath, "assets/logos",
+                                                companyLogo.Guid + ".svg");
+                if(System.IO.File.Exists(vectorial))
+                {
+                    companyLogo.SvgLogo      = null;
+                    companyLogo.ErrorMessage = "GUID clash, please retry and report to the administrator.";
+
+                    ViewData["CompanyId"] =
+                        new
+                            SelectList(_context.Companies.Select(c => new CompanyViewModel {Name = c.Name, Id = c.Id}).OrderBy(c => c.Name),
+                                       "Id", "Name", companyLogo.CompanyId);
+                    return View(companyLogo);
+                }
+
+                FileStream outSvg = new FileStream(vectorial, FileMode.CreateNew);
+                await svgMs.CopyToAsync(outSvg);
+                svgMs.Position = 0;
+
+                SKSvg svg = null;
+
+                try
+                {
+                    foreach(string format in new[] {"png", "webp"})
+                    {
+                        if(!Directory.Exists(Path.Combine(hostingEnvironment.WebRootPath, "assets/logos", format))) ;
+                        Directory.CreateDirectory(Path.Combine(hostingEnvironment.WebRootPath, "assets/logos", format));
+
+                        SKEncodedImageFormat skFormat;
+                        switch(format)
+                        {
+                            case "webp":
+                                skFormat = SKEncodedImageFormat.Webp;
+                                break;
+                            default:
+                                skFormat = SKEncodedImageFormat.Png;
+                                break;
+                        }
+
+                        foreach(int multiplier in new[] {1, 2, 3})
+                        {
+                            if(!Directory.Exists(Path.Combine(hostingEnvironment.WebRootPath, "assets/logos", format,
+                                                              $"{multiplier}x"))) ;
+                            Directory.CreateDirectory(Path.Combine(hostingEnvironment.WebRootPath, "assets/logos",
+                                                                   format, $"{multiplier}x"));
+
+                            string rendered = Path.Combine(hostingEnvironment.WebRootPath, "assets/logos", format,
+                                                           $"{multiplier}x", companyLogo.Guid + $".{format}");
+
+                            if(System.IO.File.Exists(rendered))
+                            {
+                                companyLogo.SvgLogo      = null;
+                                companyLogo.ErrorMessage = "GUID clash, please retry and report to the administrator.";
+
+                                ViewData["CompanyId"] =
+                                    new
+                                        SelectList(_context.Companies.Select(c => new CompanyViewModel {Name = c.Name, Id = c.Id}).OrderBy(c => c.Name),
+                                                   "Id", "Name", companyLogo.CompanyId);
+                                return View(companyLogo);
+                            }
+
+                            Console.WriteLine("Rendering {0}", rendered);
+                            if(svg == null)
+                            {
+                                svg = new SKSvg();
+                                svg.Load(svgMs);
+                            }
+
+                            SKRect   svgSize = svg.Picture.CullRect;
+                            SKMatrix matrix  = SKMatrix.MakeScale(multiplier, multiplier);
+                            SKBitmap bitmap = new SKBitmap((int)(svgSize.Width  * multiplier),
+                                                           (int)(svgSize.Height * multiplier));
+                            SKCanvas canvas = new SKCanvas(bitmap);
+                            canvas.DrawPicture(svg.Picture, ref matrix);
+                            canvas.Flush();
+                            SKImage    image = SKImage.FromBitmap(bitmap);
+                            SKData     data  = image.Encode(skFormat, 100);
+                            FileStream outfs = new FileStream(rendered, FileMode.CreateNew);
+                            data.SaveTo(outfs);
+                            outfs.Close();
+
+                            svgMs.Position = 0;
+                        }
+                    }
+
+                    foreach(string format in new[] {"png", "webp"})
+                    {
+                        if(!Directory.Exists(Path.Combine(hostingEnvironment.WebRootPath, "assets/logos/thumbs",
+                                                          format))) ;
+                        Directory.CreateDirectory(Path.Combine(hostingEnvironment.WebRootPath, "assets/logos/thumbs",
+                                                               format));
+
+                        SKEncodedImageFormat skFormat;
+                        switch(format)
+                        {
+                            case "webp":
+                                skFormat = SKEncodedImageFormat.Webp;
+                                break;
+                            default:
+                                skFormat = SKEncodedImageFormat.Png;
+                                break;
+                        }
+
+                        foreach(int multiplier in new[] {1, 2, 3})
+                        {
+                            if(!Directory.Exists(Path.Combine(hostingEnvironment.WebRootPath, "assets/logos/thumbs",
+                                                              format, $"{multiplier}x"))) ;
+                            Directory.CreateDirectory(Path.Combine(hostingEnvironment.WebRootPath,
+                                                                   "assets/logos/thumbs", format, $"{multiplier}x"));
+
+                            string rendered = Path.Combine(hostingEnvironment.WebRootPath, "assets/logos/thumbs",
+                                                           format, $"{multiplier}x", companyLogo.Guid + $".{format}");
+
+                            if(System.IO.File.Exists(rendered))
+                            {
+                                companyLogo.SvgLogo      = null;
+                                companyLogo.ErrorMessage = "GUID clash, please retry and report to the administrator.";
+
+                                ViewData["CompanyId"] =
+                                    new
+                                        SelectList(_context.Companies.Select(c => new CompanyViewModel {Name = c.Name, Id = c.Id}).OrderBy(c => c.Name),
+                                                   "Id", "Name", companyLogo.CompanyId);
+                                return View(companyLogo);
+                            }
+
+                            Console.WriteLine("Rendering {0}", rendered);
+                            if(svg == null)
+                            {
+                                svg = new SKSvg();
+                                svg.Load(svgMs);
+                            }
+
+                            SKRect   svgSize   = svg.Picture.CullRect;
+                            float    svgMax    = Math.Max(svgSize.Width, svgSize.Height);
+                            float    canvasMin = 32        * multiplier;
+                            float    scale     = canvasMin / svgMax;
+                            SKMatrix matrix    = SKMatrix.MakeScale(scale, scale);
+                            SKBitmap bitmap =
+                                new SKBitmap((int)(svgSize.Width * scale), (int)(svgSize.Height * scale));
+                            SKCanvas canvas = new SKCanvas(bitmap);
+                            canvas.DrawPicture(svg.Picture, ref matrix);
+                            canvas.Flush();
+                            SKImage    image = SKImage.FromBitmap(bitmap);
+                            SKData     data  = image.Encode(skFormat, 100);
+                            FileStream outfs = new FileStream(rendered, FileMode.CreateNew);
+                            data.SaveTo(outfs);
+                            outfs.Close();
+
+                            svgMs.Position = 0;
+                        }
+                    }
+                }
+                catch(IOException e)
+                {
+                    Console.WriteLine(e);
+                    throw;
+                }
+            }
+
+            _context.Add(companyLogo);
+            await _context.SaveChangesAsync();
+            return RedirectToAction(nameof(Index));
+        }
 
         // GET: CompanyLogos/Edit/5
         public async Task<IActionResult> Edit(int? id)
diff --git a/cicm_web/Areas/Admin/Views/CompanyLogos/Create.cshtml b/cicm_web/Areas/Admin/Views/CompanyLogos/Create.cshtml
index 984c342e..4a6e55f3 100644
--- a/cicm_web/Areas/Admin/Views/CompanyLogos/Create.cshtml
+++ b/cicm_web/Areas/Admin/Views/CompanyLogos/Create.cshtml
@@ -1,41 +1,65 @@
-@* @model Cicm.Database.Models.CompanyLogo *@
-@* *@
-@* @{ *@
-@*     ViewData["Title"] = "Create"; *@
-@* } *@
-@* *@
-@* <h1>Create</h1> *@
-@* *@
-@* <h4>Company logo</h4> *@
-@* <hr /> *@
-@* <div class="row"> *@
-@*     <div class="col-md-4"> *@
-@*         <form asp-action="Create"> *@
-@*             <div asp-validation-summary="ModelOnly" class="text-danger"></div> *@
-@*             <div class="form-group"> *@
-@*                 <label asp-for="CompanyId" class="control-label"></label> *@
-@*                 <select asp-for="CompanyId" class ="form-control" asp-items="ViewBag.CompanyId"></select> *@
-@*             </div> *@
-@*             <div class="form-group"> *@
-@*                 <label asp-for="Year" class="control-label"></label> *@
-@*                 <input asp-for="Year" class="form-control" /> *@
-@*                 <span asp-validation-for="Year" class="text-danger"></span> *@
-@*             </div> *@
-@*             <div class="form-group"> *@
-@*                 <label asp-for="Guid" class="control-label"></label> *@
-@*                 <input asp-for="Guid" class="form-control" /> *@
-@*                 <span asp-validation-for="Guid" class="text-danger"></span> *@
-@*             </div> *@
-@*             <div class="form-group"> *@
-@*                 <input class="btn btn-primary" *@
-@*                        type="submit" *@
-@*                        value="Create" /> *@
-@*                 <a asp-action="Index" *@
-@*                    class="btn btn-secondary"> *@
-@*                     Back to List *@
-@*                 </a> *@
-@*             </div> *@
-@*         </form> *@
-@*     </div> *@
-@* </div> *@
-@* *@
\ No newline at end of file
+@model Cicm.Database.Models.CompanyLogo
+@{
+    ViewData["Title"] = "Create";
+}
+<h1>Create</h1>
+<h4>Company logo</h4>
+<hr />
+<div class="row">
+    <div class="col-md-4">
+        <form asp-action="Create"
+              enctype="multipart/form-data">
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <div class="form-group">
+                <label asp-for="Company"
+                       class="control-label">
+                </label>
+                <select asp-for="CompanyId"
+                        class="form-control"
+                        asp-items="ViewBag.CompanyId">
+                </select>
+            </div>
+            <div class="form-group">
+                <label asp-for="Year"
+                       class="control-label">
+                </label>
+                <input asp-for="Year"
+                       class="form-control" />
+                <span asp-validation-for="Year"
+                      class="text-danger">
+                </span>
+            </div>
+            <div class="form-group">
+                <div class="col-md-10">
+                    <label asp-for="SvgLogo"
+                           class="control-label">
+                    </label>
+                    <input asp-for="SvgLogo"
+                           class="form-control" />
+                    <span asp-validation-for="SvgLogo"
+                          class="text-danger">
+                    </span>
+                    @if(Model?.ErrorMessage != null)
+                    {
+                        <span class="text-danger">@Model.ErrorMessage</span>
+                    }
+                </div>
+            </div>
+            <div class="form-group">
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Create" />
+                <a asp-action="Index"
+                   class="btn btn-secondary">
+                    Back to List
+                </a>
+            </div>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml b/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml
index f465f694..82c7f7ca 100644
--- a/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/CompanyLogos/Index.cshtml
@@ -8,9 +8,8 @@
 <h1>Company logos</h1>
 
 <p>
-    <a aria-disabled="True"
-       asp-action="Create"
-       class="btn btn-primary disabled">
+    <a asp-action="Create"
+       class="btn btn-primary">
         Create New
     </a>
 </p>
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index db459668..f2f53359 100644
--- a/cicm_web/cicm_web.csproj
+++ b/cicm_web/cicm_web.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.558</Version>
+    <Version>3.0.99.574</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>