diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs
index 2d58ef2..74f9197 100644
--- a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Bundle.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
          xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
 	<Bundle Name="FlexiTimeSystemInstaller" 
-          Version="0.2.1.0" 
+          Version="0.2.3.0" 
           Manufacturer="Chris Watts" 
           UpgradeCode="d38e92db-48f9-40c3-9a6f-d76fbd07326e">
     <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
diff --git a/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs b/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
index d977d37..02dfc77 100644
--- a/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
+++ b/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
@@ -527,7 +527,18 @@ namespace SQLiteRepository
             var query = $"select * from {nameof(PolicyDb)}";
             var policies = _connection.Query<PolicyDb>(query);
 
-
+            if (!policies.Any())
+            {
+                return new Policy()
+                {
+                    ChangeAuthor = string.Empty,
+                    ChangeDate = DateTime.UtcNow,
+                    ChangeDescription = string.Empty,
+                    Html=string.Empty,
+                    Markdown = string.Empty,
+                    Version = "0"
+                };
+            }
             return PolicyConverter.ConvertToPolicyDto(policies.OrderByDescending(x => x.Version).FirstOrDefault());
         }
 
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Properties/AssemblyInfo.cs b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Properties/AssemblyInfo.cs
index ab5f814..ca77f88 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Properties/AssemblyInfo.cs
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.2.0")]
-[assembly: AssemblyFileVersion("0.2.2.0")]
+[assembly: AssemblyVersion("0.2.3.0")]
+[assembly: AssemblyFileVersion("0.2.3.0")]
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/Admin.html b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/Admin.html
index 4f9efba..2722c8e 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/Admin.html
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/Admin.html
@@ -119,7 +119,7 @@
                     <textarea id="policyEditor"></textarea>
                 </div>
                 <div id="preview" class="tab-pane fade in">
-                    <div data-bind="html: policyData.html" class="well-lg"></div>
+                    <div data-bind="html: policyData.Html" class="well-lg"></div>
                 </div>
             </div>
             <button class="btn btn-primary pull-right" data-toggle="modal" data-target="#saveDialog">Save</button><!--data-bind="click: $root.policySave"-->
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/admin.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/admin.js
index 61713dd..a336b65 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/admin.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/admin.js
@@ -22,7 +22,7 @@
         var escaped = "unknown";
 
         if (parserHandler.dom.length > 0) {
-            escaped = parserHandler.dom[0].raw.toLowerCase().trim().replace(/ /g, "-");
+            escaped = parserHandler.dom[0].raw.toLowerCase().trim().replace(/ /g, "-").replace(/#+/g,"");
         }
 
         return "<h" + level + " id=\"" + escaped + "\">"
@@ -66,7 +66,7 @@
     });
     self.editor.codemirror.on("changes",
         function () {
-            self.policyData.html(self.editor.options.previewRender(self.editor.value()));
+            self.policyData.Html(self.editor.options.previewRender(self.editor.value()));
         });
     self.uiPages = {
         overview: "overview",
@@ -169,8 +169,9 @@
     self.policySave = function () {
         var url = self.helpers.createRequestUrl(self.apiEndpoints.savePolicy, null, false);
         self.policyData.Markdown(self.editor.value()); //make sure we update it, as it doesnt push the value back into the variable
-        //console.log(self.policyData());
-        $.post(url, self.policyData(), function() {
+        //console.log(self.policyData();)rea#
+        var data = ko.toJS(self.policyData);
+        $.post(url, data, function() {
         }, "json") //todo: check this serialisation as the object is now complex.
             .done(function() {
                 self.policyReload();
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/admin.min.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/admin.min.js
index 1e8dff2..f000d57 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/admin.min.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/admin.min.js
@@ -1 +1 @@
-function AdminVM(){var n=this;n.groupsList=ko.observable(null);n.groupEditItem=ko.observable(null);n.unassignedCardList=ko.observable(null);n.helpers=new Helpers;n.policyMarkdown="";n.policyData=new policy;n.renderer=new marked.Renderer;n.renderer.blockquote=function(n){return'<blockquote class="blockquote">'+n+"<\/blockquote>"};n.renderer.heading=function(n,t){var r=new Tautologistics.NodeHtmlParser.DefaultHandler(function(t){if(t)throw new Error('Cannot parse "'+n+'" in markdown file.');}),u=new Tautologistics.NodeHtmlParser.Parser(r),i;return u.parseComplete(n),i="unknown",r.dom.length>0&&(i=r.dom[0].raw.toLowerCase().trim().replace(/ /g,"-")),"<h"+t+' id="'+i+'">  <a class="heading-anchor" style="display:none;" href="#'+i+'">    <i class="oi oi-link-intact"><\/i>  <\/a>'+n+"<\/h"+t+">"};n.renderer.table=function(n,t){return'<table class="table"><thead class="thead-default">'+n+"<\/thead><tbody>"+t+"<\/tbody><\/table>"};n.renderer.code=function(n,t){var i=!!(t&&hljs.getLanguage(t)),r=i?hljs.highlight(t,n).value:n;return'<pre><code class="hljs lang-'+t+'">'+r+"<\/code><\/pre>"};n.editor=new EasyMDE({element:document.getElementById("policyEditor"),showIcons:["bold","italic","strikethrough","heading","heading-smaller","heading-bigger","heading-1","heading-2","heading-3","code","quote","unordered-list","ordered-list","clean-block","link","table","horizontal-rule","guide","table"],hideIcons:["preview","side-by-side","fullscreen"],renderingConfig:{markedOptions:{renderer:n.renderer}}});n.editor.codemirror.on("changes",function(){n.policyData.html(n.editor.options.previewRender(n.editor.value()))});n.uiPages={overview:"overview",group:"groups",home:function(){return this.overview}};n.apiEndpoints={deleteGroups:"/api/groups/delete",getGroups:"/api/groups",editGroup:"/api/groups/edit",getUnassignedCards:"/api/cards/unassigned",clearUnassignedCards:"/api/cards/unassigned",getPolicy:"/api/app/policy",savePolicy:"/api/app/policy"};n.clearGroupForm=function(){n.helpers.goToMenuOption(n.uiPages.group);n.groupEditItem(null)};n.hideGroupForm=function(){n.groupEditItem(null)};n.newGroupForm=function(){n.groupEditItem({Id:-1,Name:""});n.helpers.goToMenuOption(n.uiPages.group)};n.groupFormHidden=ko.computed(function(){return n.groupEditItem()==null},n);n.editGroupClick=function(t){n.helpers.goToMenuOption(n.uiPages.group);n.groupEditItem(t)};n.getGroups=function(){var t=n.helpers.createRequestUrl(n.apiEndpoints.getGroups,null,!1);$.getJSON(t,function(t){n.groupsList(t)}).fail(function(t,i,r){console.log("error - getGroups");var u=n.helpers.processRequestFailure(t,i,r)})};n.deleteGroup=function(t){var i=n.helpers.createRequestUrl(n.apiEndpoints.deleteGroups,[{key:"groupId",value:t}],!1,!1);$.ajax({url:i,type:"DELETE",success:function(){console.log("deleted "+t);n.hideGroupForm();n.helpers.goToMenuOption(n.uiPages.home())}});console.log("delete: "+t)};n.submitGroupEdit=function(t){var i=n.helpers.createRequestUrl(n.apiEndpoints.editGroup,null,!1);$.post(i,t,function(){},"json").done(function(){n.groupEditItem(null);n.helpers.goToMenuOption(n.uiPages.home())}).fail(function(t,i,r){n.helpers.goToMenuOption(n.uiPages.home());var u=n.helpers.processRequestFailure(t,i,r)})};n.getUnassignedCardData=function(){var t=n.helpers.createRequestUrl(n.apiEndpoints.getUnassignedCards,null,!1);$.getJSON(t,function(t){n.unassignedCardList(t)}).fail(function(t,i,r){console.log("error - getUnassignedCards");var u=n.helpers.processRequestFailure(t,i,r)})};n.clearUnassignedCards=function(){var t=n.helpers.createRequestUrl(n.apiEndpoints.clearUnassignedCards,null,!1);$.ajax({type:"DELETE",url:t,data:"",success:function(){n.getUnassignedCardData()},error:function(t,i,r){console.log("error - clearUnassignedCards");var u=n.helpers.processRequestFailure(resp,i,r)}})};n.padNumber=function(n){return(n<10?"0":"")+n};n.policySave=function(){var t=n.helpers.createRequestUrl(n.apiEndpoints.savePolicy,null,!1);n.policyData.Markdown(n.editor.value());$.post(t,n.policyData(),function(){},"json").done(function(){n.policyReload()}).fail(function(t,i,r){var u=n.helpers.processRequestFailure(t,i,r);console.log(u)})};n.policyReload=function(){var t=n.helpers.createRequestUrl(n.apiEndpoints.getPolicy,[],!1,!1);$.getJSON(t,function(t){n.editor.value(t.Markdown);t.Version=(parseInt(t.Version)+1).toString();n.policyData.update(t);$("#saveDialog").modal("hide")}).fail(function(t,i,r){console.log("error - policyReload");var u=n.helpers.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"policyReload")})};n.convertToDisplayDateTime=function(t){var i=new Date(t);return i.getDate()+" "+i.toLocaleString("en-us",{month:"long"})+" "+(i.getYear()-100)+"  "+n.padNumber(i.getHours())+":"+n.padNumber(i.getMinutes())+":"+n.padNumber(i.getSeconds())};Sammy(function(){this.disable_push_state=!0;this.get("#overview",function(){n.getGroups();n.getUnassignedCardData();n.policyReload()});this.post("#editgroup",function(){return n.submitGroupEdit(n.groupEditItem()),!1});this.get("",function(){this.app.runRoute("get","#"+n.uiPages.home())})}).run()}ko.applyBindings(new AdminVM)
\ No newline at end of file
+function AdminVM(){var n=this;n.groupsList=ko.observable(null);n.groupEditItem=ko.observable(null);n.unassignedCardList=ko.observable(null);n.helpers=new Helpers;n.policyMarkdown="";n.policyData=new policy;n.renderer=new marked.Renderer;n.renderer.blockquote=function(n){return'<blockquote class="blockquote">'+n+"<\/blockquote>"};n.renderer.heading=function(n,t){var r=new Tautologistics.NodeHtmlParser.DefaultHandler(function(t){if(t)throw new Error('Cannot parse "'+n+'" in markdown file.');}),u=new Tautologistics.NodeHtmlParser.Parser(r),i;return u.parseComplete(n),i="unknown",r.dom.length>0&&(i=r.dom[0].raw.toLowerCase().trim().replace(/ /g,"-").replace(/#+/g,"")),"<h"+t+' id="'+i+'">  <a class="heading-anchor" style="display:none;" href="#'+i+'">    <i class="oi oi-link-intact"><\/i>  <\/a>'+n+"<\/h"+t+">"};n.renderer.table=function(n,t){return'<table class="table"><thead class="thead-default">'+n+"<\/thead><tbody>"+t+"<\/tbody><\/table>"};n.renderer.code=function(n,t){var i=!!(t&&hljs.getLanguage(t)),r=i?hljs.highlight(t,n).value:n;return'<pre><code class="hljs lang-'+t+'">'+r+"<\/code><\/pre>"};n.editor=new EasyMDE({element:document.getElementById("policyEditor"),showIcons:["bold","italic","strikethrough","heading","heading-smaller","heading-bigger","heading-1","heading-2","heading-3","code","quote","unordered-list","ordered-list","clean-block","link","table","horizontal-rule","guide","table"],hideIcons:["preview","side-by-side","fullscreen"],renderingConfig:{markedOptions:{renderer:n.renderer}}});n.editor.codemirror.on("changes",function(){n.policyData.Html(n.editor.options.previewRender(n.editor.value()))});n.uiPages={overview:"overview",group:"groups",home:function(){return this.overview}};n.apiEndpoints={deleteGroups:"/api/groups/delete",getGroups:"/api/groups",editGroup:"/api/groups/edit",getUnassignedCards:"/api/cards/unassigned",clearUnassignedCards:"/api/cards/unassigned",getPolicy:"/api/app/policy",savePolicy:"/api/app/policy"};n.clearGroupForm=function(){n.helpers.goToMenuOption(n.uiPages.group);n.groupEditItem(null)};n.hideGroupForm=function(){n.groupEditItem(null)};n.newGroupForm=function(){n.groupEditItem({Id:-1,Name:""});n.helpers.goToMenuOption(n.uiPages.group)};n.groupFormHidden=ko.computed(function(){return n.groupEditItem()==null},n);n.editGroupClick=function(t){n.helpers.goToMenuOption(n.uiPages.group);n.groupEditItem(t)};n.getGroups=function(){var t=n.helpers.createRequestUrl(n.apiEndpoints.getGroups,null,!1);$.getJSON(t,function(t){n.groupsList(t)}).fail(function(t,i,r){console.log("error - getGroups");var u=n.helpers.processRequestFailure(t,i,r)})};n.deleteGroup=function(t){var i=n.helpers.createRequestUrl(n.apiEndpoints.deleteGroups,[{key:"groupId",value:t}],!1,!1);$.ajax({url:i,type:"DELETE",success:function(){console.log("deleted "+t);n.hideGroupForm();n.helpers.goToMenuOption(n.uiPages.home())}});console.log("delete: "+t)};n.submitGroupEdit=function(t){var i=n.helpers.createRequestUrl(n.apiEndpoints.editGroup,null,!1);$.post(i,t,function(){},"json").done(function(){n.groupEditItem(null);n.helpers.goToMenuOption(n.uiPages.home())}).fail(function(t,i,r){n.helpers.goToMenuOption(n.uiPages.home());var u=n.helpers.processRequestFailure(t,i,r)})};n.getUnassignedCardData=function(){var t=n.helpers.createRequestUrl(n.apiEndpoints.getUnassignedCards,null,!1);$.getJSON(t,function(t){n.unassignedCardList(t)}).fail(function(t,i,r){console.log("error - getUnassignedCards");var u=n.helpers.processRequestFailure(t,i,r)})};n.clearUnassignedCards=function(){var t=n.helpers.createRequestUrl(n.apiEndpoints.clearUnassignedCards,null,!1);$.ajax({type:"DELETE",url:t,data:"",success:function(){n.getUnassignedCardData()},error:function(t,i,r){console.log("error - clearUnassignedCards");var u=n.helpers.processRequestFailure(resp,i,r)}})};n.padNumber=function(n){return(n<10?"0":"")+n};n.policySave=function(){var i=n.helpers.createRequestUrl(n.apiEndpoints.savePolicy,null,!1),t;n.policyData.Markdown(n.editor.value());t=ko.toJS(n.policyData);$.post(i,t,function(){},"json").done(function(){n.policyReload()}).fail(function(t,i,r){var u=n.helpers.processRequestFailure(t,i,r);console.log(u)})};n.policyReload=function(){var t=n.helpers.createRequestUrl(n.apiEndpoints.getPolicy,[],!1,!1);$.getJSON(t,function(t){n.editor.value(t.Markdown);t.Version=(parseInt(t.Version)+1).toString();n.policyData.update(t);$("#saveDialog").modal("hide")}).fail(function(t,i,r){console.log("error - policyReload");var u=n.helpers.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"policyReload")})};n.convertToDisplayDateTime=function(t){var i=new Date(t);return i.getDate()+" "+i.toLocaleString("en-us",{month:"long"})+" "+(i.getYear()-100)+"  "+n.padNumber(i.getHours())+":"+n.padNumber(i.getMinutes())+":"+n.padNumber(i.getSeconds())};Sammy(function(){this.disable_push_state=!0;this.get("#overview",function(){n.getGroups();n.getUnassignedCardData();n.policyReload()});this.post("#editgroup",function(){return n.submitGroupEdit(n.groupEditItem()),!1});this.get("",function(){this.app.runRoute("get","#"+n.uiPages.home())})}).run()}ko.applyBindings(new AdminVM)
\ No newline at end of file
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/js/PolicyObject.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/js/PolicyObject.js
index d891362..408cd72 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/js/PolicyObject.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/js/PolicyObject.js
@@ -3,28 +3,29 @@
     if (typeof data === "undefined") {
         data = createDefaultPolicy();
     }
-    self.changeDate = ko.observable(data.changeDate);
-    self.description = ko.observable(data.description);
-    self.changeAuthor = ko.observable(data.changeAuthor);
-    self.version = ko.observable(data.version);
-    self.markdown = ko.observable(data.markdown);
-    self.html = ko.observable(data.html);
+    self.ChangeDate = ko.observable(data.ChangeDate);
+    self.ChangeDescription = ko.observable(data.ChangeDescription);
+    self.ChangeAuthor = ko.observable(data.ChangeAuthor);
+    self.Version = ko.observable(data.Version);
+    self.Markdown = ko.observable(data.Markdown);
+    self.Html = ko.observable(data.Html);
     function createDefaultPolicy() {
         return {
-            changeDate: moment().format(),
-            description: "",
-            changeAuthor: "",
-            version: -1,
-            markdown: "",
-            html: ""
+            ChangeDate: moment().toISOString(),
+            Description: "",
+            ChangeAuthor: "",
+            Version: -1,
+            Markdown: "",
+            Html: ""
         };
     }
-    self.update = function(data) {
-        self.changeDate(data.changeDate);
-        self.description(data.description);
-        self.changeAuthor(data.changeAuthor);
-        self.version(data.version);
-        self.markdown(data.markdown);
-        self.html(data.html);
+    self.update = function (data) {
+        if (!data) return;
+        self.ChangeDate(data.ChangeDate);
+        self.ChangeDescription(data.ChangeDescription);
+        self.ChangeAuthor(data.ChangeAuthor);
+        self.Version(data.Version);
+        self.Markdown(data.Markdown);
+        self.Html(data.Html);
     }
 }
\ No newline at end of file