diff --git a/MTSC.UnitTests/ResourcesTests.cs b/MTSC.UnitTests/ResourcesTests.cs
new file mode 100644
index 0000000..98759c8
--- /dev/null
+++ b/MTSC.UnitTests/ResourcesTests.cs
@@ -0,0 +1,23 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MTSC.UnitTests
+{
+    [TestClass]
+    public class ResourcesTests
+    {
+        public static Server.Server server;
+        [ClassInitialize]
+        public static void InitializeServer(TestContext testContext)
+        {
+            server = new Server.Server();
+        }
+        [TestMethod]
+        public void AddAndGetResource()
+        {
+            StringResource resource = new StringResource { Value = "hello" };
+            server.WithResource(resource);
+            var gotResource = server.GetResource<StringResource>();
+            Assert.AreEqual(gotResource, resource);
+        }
+    }
+}
diff --git a/MTSC.UnitTests/StringResource.cs b/MTSC.UnitTests/StringResource.cs
new file mode 100644
index 0000000..471a9c1
--- /dev/null
+++ b/MTSC.UnitTests/StringResource.cs
@@ -0,0 +1,9 @@
+using MTSC.Server.Resources;
+
+namespace MTSC.UnitTests
+{
+    public class StringResource : IResource
+    {
+        public string Value { get; set; }
+    }
+}
diff --git a/MTSC/MTSC.csproj b/MTSC/MTSC.csproj
index bbd7d0e..e93cb4e 100644
--- a/MTSC/MTSC.csproj
+++ b/MTSC/MTSC.csproj
@@ -5,12 +5,12 @@
     <TargetFrameworks>netcoreapp2.1;net48;netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <ApplicationIcon />
     <StartupObject />
-    <Version>1.6.7</Version>
+    <Version>1.7</Version>
     <Authors>Alexandru-Victor Macocian</Authors>
     <Product>MTSC</Product>
     <Description>Modular TCP Server and Client</Description>
-    <AssemblyVersion>0.1.6.7</AssemblyVersion>
-    <FileVersion>0.1.6.7</FileVersion>
+    <AssemblyVersion>0.1.7.0</AssemblyVersion>
+    <FileVersion>0.1.7.0</FileVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Platforms>AnyCPU;x64</Platforms>
     <PackageProjectUrl>https://github.com/AlexMacocian/MTSC</PackageProjectUrl>
diff --git a/MTSC/Server/Resources/IResource.cs b/MTSC/Server/Resources/IResource.cs
new file mode 100644
index 0000000..1fd1794
--- /dev/null
+++ b/MTSC/Server/Resources/IResource.cs
@@ -0,0 +1,6 @@
+namespace MTSC.Server.Resources
+{
+    public interface IResource
+    {
+    }
+}
diff --git a/MTSC/Server/Server.cs b/MTSC/Server/Server.cs
index f195ab1..807ee0e 100644
--- a/MTSC/Server/Server.cs
+++ b/MTSC/Server/Server.cs
@@ -1,6 +1,7 @@
 using MTSC.Exceptions;
 using MTSC.Logging;
 using MTSC.Server.Handlers;
+using MTSC.Server.Resources;
 using MTSC.Server.UsageMonitors;
 using System;
 using System.Collections.Concurrent;
@@ -61,6 +62,10 @@ namespace MTSC.Server
         /// List of clients currently connected to the server.
         /// </summary>
         public List<ClientData> Clients { get; set; } = new List<ClientData>();
+        /// <summary>
+        /// Dictionary of resources
+        /// </summary>
+        public Dictionary<Type, IResource> Resources { get; } = new Dictionary<Type, IResource>();
         #endregion
         #region Constructors
         /// <summary>
@@ -90,6 +95,11 @@ namespace MTSC.Server
         }
         #endregion
         #region Public Methods
+        public Server WithResource(IResource resource)
+        {
+            Resources[resource.GetType()] = resource;
+            return this;
+        }
         /// <summary>
         /// Requests that the client provides a certificate.
         /// </summary>
@@ -200,6 +210,10 @@ namespace MTSC.Server
             serverUsageMonitors.Add(serverUsageMonitor);
             return this;
         }
+        public IResource GetResource<T>()
+        {
+            return Resources[typeof(T)];
+        }
         /// <summary>
         /// Queues a message to be sent.
         /// </summary>