diff --git a/dbpRestAPI/App_Data/testing/logs/RVNres00001.jrs b/dbpRestAPI/App_Data/testing/logs/RVNres00001.jrs
diff --git a/dbpRestAPI/App_Data/testing/logs/RVNres00002.jrs b/dbpRestAPI/App_Data/testing/logs/RVNres00002.jrs
diff --git a/dbpRestAPI/App_Data/testing/raven-data.ico b/dbpRestAPI/App_Data/testing/raven-data.ico
diff --git a/dbpRestAPI/App_Data/testing/system/RVN.chk b/dbpRestAPI/App_Data/testing/system/RVN.chk
diff --git a/dbpRestAPI/App_Start/WebApiConfig.cs b/dbpRestAPI/App_Start/WebApiConfig.cs
@@ -21,7 +21,7 @@ public static void Register(HttpConfiguration config)
                 defaults: new { id = RouteParameter.Optional }
             );
             //Enabling cors so I can request stuff from my ui app
-            config.EnableCors(new EnableCorsAttribute("http://localhost:9000,http://dev.dbp.com", "*", "*"));
+            config.EnableCors(new EnableCorsAttribute("*", "*", "*"));
 
             var formatter = GlobalConfiguration.Configuration.Formatters.JsonFormatter;
             formatter.SerializerSettings.ContractResolver =

diff --git a/dbpRestAPI/CompiledIndexCache/1182090878.EGbWqpkG5%2b9d%2ft%2bs0Rr5vw%3d%3d.nodebug.dll b/dbpRestAPI/CompiledIndexCache/1182090878.EGbWqpkG5%2b9d%2ft%2bs0Rr5vw%3d%3d.nodebug.dll
diff --git a/dbpRestAPI/CompiledIndexCache/1182090878.EGbWqpkG5%2b9d%2ft%2bs0Rr5vw%3d%3d.nodebug.dll.cs b/dbpRestAPI/CompiledIndexCache/1182090878.EGbWqpkG5%2b9d%2ft%2bs0Rr5vw%3d%3d.nodebug.dll.cs
@@ -0,0 +1,41 @@
+using Raven.Abstractions;
+using Raven.Database.Linq;
+using System.Linq;
+using System.Collections.Generic;
+using System.Collections;
+using System;
+using Raven.Database.Linq.PrivateExtensions;
+using Lucene.Net.Documents;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using Raven.Database.Indexing;
+
+public class Index_Raven_DocumentsByEntityName : Raven.Database.Linq.AbstractViewGenerator
+{
+	public Index_Raven_DocumentsByEntityName()
+	{
+		this.ViewText = @"from doc in docs 
+select new 
+{ 
+    Tag = doc[""@metadata""][""Raven-Entity-Name""], 
+    LastModified = (DateTime)doc[""@metadata""][""Last-Modified""],
+    LastModifiedTicks = ((DateTime)doc[""@metadata""][""Last-Modified""]).Ticks 
+};";
+		this.AddMapDefinition(docs => 
+			from doc in ((IEnumerable<dynamic>)docs)
+			select new {
+				Tag = doc["@metadata"]["Raven-Entity-Name"],
+				LastModified = (DateTime)doc["@metadata"]["Last-Modified"],
+				LastModifiedTicks = ((DateTime)doc["@metadata"]["Last-Modified"]).Ticks,
+				__document_id = doc.__document_id
+			});
+		this.AddField("Tag");
+		this.AddField("LastModified");
+		this.AddField("LastModifiedTicks");
+		this.AddField("__document_id");
+		this.AddQueryParameterForMap("Ticks");
+		this.AddQueryParameterForMap("__document_id");
+		this.AddQueryParameterForReduce("Ticks");
+		this.AddQueryParameterForReduce("__document_id");
+	}
+}
diff --git a/dbpRestAPI/CompiledIndexCache/2016311333.B07pEC9Gbe%2fZ7d%2fWrrGVaw%3d%3d.debug.dll b/dbpRestAPI/CompiledIndexCache/2016311333.B07pEC9Gbe%2fZ7d%2fWrrGVaw%3d%3d.debug.dll
diff --git a/dbpRestAPI/CompiledIndexCache/2016311333.B07pEC9Gbe%2fZ7d%2fWrrGVaw%3d%3d.debug.dll.cs b/dbpRestAPI/CompiledIndexCache/2016311333.B07pEC9Gbe%2fZ7d%2fWrrGVaw%3d%3d.debug.dll.cs
@@ -0,0 +1,36 @@
+using Raven.Abstractions;
+using Raven.Database.Linq;
+using System.Linq;
+using System.Collections.Generic;
+using System.Collections;
+using System;
+using Raven.Database.Linq.PrivateExtensions;
+using Lucene.Net.Documents;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using Raven.Database.Indexing;
+
+public class Index_Auto_PortfolioBooks_ByTrimmedIdSortByTrimmedId : Raven.Database.Linq.AbstractViewGenerator
+{
+	public Index_Auto_PortfolioBooks_ByTrimmedIdSortByTrimmedId()
+	{
+		this.ViewText = @"from doc in docs.PortfolioBooks
+select new {
+	TrimmedId = doc.TrimmedId
+}";
+		this.ForEntityNames.Add("PortfolioBooks");
+		this.AddMapDefinition(docs => 
+			from doc in ((IEnumerable<dynamic>)docs)
+			where string.Equals(doc["@metadata"]["Raven-Entity-Name"], "PortfolioBooks", System.StringComparison.InvariantCultureIgnoreCase)
+			select new {
+				TrimmedId = doc.TrimmedId,
+				__document_id = doc.__document_id
+			});
+		this.AddField("TrimmedId");
+		this.AddField("__document_id");
+		this.AddQueryParameterForMap("TrimmedId");
+		this.AddQueryParameterForMap("__document_id");
+		this.AddQueryParameterForReduce("TrimmedId");
+		this.AddQueryParameterForReduce("__document_id");
+	}
+}
diff --git a/dbpRestAPI/CompiledIndexCache/2016311333.B07pEC9Gbe%2fZ7d%2fWrrGVaw%3d%3d.nodebug.dll b/dbpRestAPI/CompiledIndexCache/2016311333.B07pEC9Gbe%2fZ7d%2fWrrGVaw%3d%3d.nodebug.dll
diff --git a/dbpRestAPI/CompiledIndexCache/2016311333.B07pEC9Gbe%2fZ7d%2fWrrGVaw%3d%3d.nodebug.dll.cs b/dbpRestAPI/CompiledIndexCache/2016311333.B07pEC9Gbe%2fZ7d%2fWrrGVaw%3d%3d.nodebug.dll.cs
@@ -0,0 +1,36 @@
+using Raven.Abstractions;
+using Raven.Database.Linq;
+using System.Linq;
+using System.Collections.Generic;
+using System.Collections;
+using System;
+using Raven.Database.Linq.PrivateExtensions;
+using Lucene.Net.Documents;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using Raven.Database.Indexing;
+
+public class Index_Auto_PortfolioBooks_ByTrimmedIdSortByTrimmedId : Raven.Database.Linq.AbstractViewGenerator
+{
+	public Index_Auto_PortfolioBooks_ByTrimmedIdSortByTrimmedId()
+	{
+		this.ViewText = @"from doc in docs.PortfolioBooks
+select new {
+	TrimmedId = doc.TrimmedId
+}";
+		this.ForEntityNames.Add("PortfolioBooks");
+		this.AddMapDefinition(docs => 
+			from doc in ((IEnumerable<dynamic>)docs)
+			where string.Equals(doc["@metadata"]["Raven-Entity-Name"], "PortfolioBooks", System.StringComparison.InvariantCultureIgnoreCase)
+			select new {
+				TrimmedId = doc.TrimmedId,
+				__document_id = doc.__document_id
+			});
+		this.AddField("TrimmedId");
+		this.AddField("__document_id");
+		this.AddQueryParameterForMap("TrimmedId");
+		this.AddQueryParameterForMap("__document_id");
+		this.AddQueryParameterForReduce("TrimmedId");
+		this.AddQueryParameterForReduce("__document_id");
+	}
+}
diff --git a/dbpRestAPI/CompiledIndexCache/561521011.4dTGlyX5zsRgQStRqEreIQ%3d%3d.debug.dll b/dbpRestAPI/CompiledIndexCache/561521011.4dTGlyX5zsRgQStRqEreIQ%3d%3d.debug.dll
diff --git a/dbpRestAPI/Controllers/Base/RavenDbConfig.cs b/dbpRestAPI/Controllers/Base/RavenDbConfig.cs
@@ -8,6 +8,7 @@ namespace dbpRestAPI
     using Raven.Client;
     using Raven.Client.Embedded;
     using Raven.Client.Indexes;
+    using Raven.Database.Server;
     using System.Reflection;
 
     public class RavenDbConfig
@@ -18,22 +19,34 @@ public static IDocumentStore Store
             get
             {
                 if (_store == null)
-                    throw new InvalidOperationException(
-                    "IDocumentStore has not been initialized.");
+                {
+                    Initialize();
+                }
                 return _store;
             }
         }
 
         public static IDocumentStore Initialize()
         {
+
             if (_store == null)
             {
                 _store = new EmbeddableDocumentStore
                 {
                     ConnectionStringName = "RavenDB"
+                    //,UseEmbeddedHttpServer = true
                 };
                 _store.Conventions.IdentityPartsSeparator = "-";
-                _store.Initialize();
+                try
+                {
+                    NonAdminHttp.EnsureCanListenToWhenInNonAdminContext(8080);
+                    _store.Initialize();
+                }
+                catch (Exception ex)
+                {
+                    Console.Write(ex.ToString());
+                }
+
                 IndexCreation.CreateIndexes(Assembly.GetCallingAssembly(), Store);
                 return _store;
             }

diff --git a/dbpRestAPI/Controllers/Base/dbpBaseController.cs b/dbpRestAPI/Controllers/Base/dbpBaseController.cs
@@ -14,7 +14,6 @@ public class dbpBaseController : ApiController
         public IDocumentSession DocumentSession { get; set; }
         protected override void Initialize(HttpControllerContext controllerContext)
         {
-            RavenDbConfig.Initialize();
             this.DocumentSession = RavenDbConfig.Store.OpenSession();
             base.Initialize(controllerContext);
         }

diff --git a/dbpRestAPI/Controllers/PortfolioBooksController.cs b/dbpRestAPI/Controllers/PortfolioBooksController.cs
@@ -43,7 +43,7 @@ public IQueryable<PortfolioBook> GetPortfolioBooks()
             //    DocumentSession.SaveChanges();
             //}
 
-            return DocumentSession.Query<PortfolioBook>();
+            return DocumentSession.Query<PortfolioBook>().OrderBy(books => books.TrimmedId);
         }
 
         // GET: api/PortfolioBooks/5
@@ -76,7 +76,6 @@ public IHttpActionResult PutPortfolioBook(string Id, PortfolioBook portfolioBook
             try
             {
                 DocumentSession.Store(portfolioBook, Id);
-                DocumentSession.SaveChanges();
                 return StatusCode(HttpStatusCode.Created);
             }
             catch (Exception ex)
@@ -96,7 +95,6 @@ public IHttpActionResult PostPortfolioBook(PortfolioBook portfolioBook)
             }
 
             DocumentSession.Store(portfolioBook);
-            DocumentSession.SaveChanges();
 
             return CreatedAtRoute("DefaultApi", new { Id = portfolioBook.Id }, portfolioBook);
         }
@@ -112,7 +110,6 @@ public IHttpActionResult DeletePortfolioBook(string Id)
             }
 
             DocumentSession.Delete<PortfolioBook>(portfolioBook);
-            DocumentSession.SaveChanges();
 
             return Ok(portfolioBook);
         }

diff --git a/dbpRestAPI/Models/PortfolioBook.cs b/dbpRestAPI/Models/PortfolioBook.cs
@@ -14,5 +14,11 @@ public class PortfolioBook
         public int Order { get; set; }
         public string Category { get; set; }
         List<PortfolioItem> Items { get; set; }
+        public int TrimmedId {
+            get
+            {
+                return Convert.ToInt32(this.Id.Replace("PortfolioBooks-", ""));
+            }
+        }
     }
 }