diff --git a/Client/Client.csproj b/Client/Client.csproj
index dd9af6e..4ade6d5 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -12,6 +12,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Message\Message.csproj" />
     <ProjectReference Include="..\ProftaakRH\ProftaakRH.csproj" />
+    <ProjectReference Include="..\RH-Engine\RH-Engine.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Client/Program.cs b/Client/Program.cs
index 7b722f5..9853e51 100644
--- a/Client/Program.cs
+++ b/Client/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using Hardware;
 using Hardware.Simulators;
+using RH_Engine;
 
 namespace Client
 {
diff --git a/RH-Engine/Command.cs b/RH-Engine/Command.cs
index 3ef3bc1..0f53e73 100644
--- a/RH-Engine/Command.cs
+++ b/RH-Engine/Command.cs
@@ -4,7 +4,7 @@ using System;
 
 namespace RH_Engine
 {
-    class Command
+    public class Command
     {
         public const string STANDARD_HEAD = "Head";
         public const string STANDARD_GROUND = "GroundPlane";
diff --git a/RH-Engine/JSONParser.cs b/RH-Engine/JSONParser.cs
index 8621aff..292c524 100644
--- a/RH-Engine/JSONParser.cs
+++ b/RH-Engine/JSONParser.cs
@@ -3,7 +3,7 @@ using System;
 
 namespace RH_Engine
 {
-    class JSONParser
+    public class JSONParser
     {
         /// <summary>
         /// returns all the users from the given response
diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs
index 63c86fb..e67206a 100644
--- a/RH-Engine/Program.cs
+++ b/RH-Engine/Program.cs
@@ -10,7 +10,7 @@ namespace RH_Engine
 {
     public delegate void HandleSerial(string message);
 
-    class Program
+    public class Program
     {
         private static PC[] PCs = {
             //new PC("DESKTOP-M2CIH87", "Fabian"),
@@ -161,23 +161,6 @@ namespace RH_Engine
                 });
 
             Console.WriteLine("id of head " + GetId(Command.STANDARD_HEAD, stream, mainCommand));
-
-            //command = mainCommand.AddModel("car", "data\\customModels\\TeslaRoadster.fbx");
-            //WriteTextMessage(stream, command);
-
-            //command = mainCommand.addPanel();
-            //  WriteTextMessage(stream, command);
-            //  string response = ReadPrefMessage(stream);
-            //  Console.WriteLine("add Panel response: \n\r" + response);
-            //  string uuidPanel = JSONParser.getPanelID(response);
-            //  WriteTextMessage(stream, mainCommand.ClearPanel(uuidPanel));
-            //  Console.WriteLine(ReadPrefMessage(stream));
-            //  WriteTextMessage(stream, mainCommand.bikeSpeed(uuidPanel, 2.42));
-            //  Console.WriteLine(ReadPrefMessage(stream));
-            //  WriteTextMessage(stream, mainCommand.ColorPanel(uuidPanel));
-            //  Console.WriteLine("Color panel: " + ReadPrefMessage(stream));
-            //  WriteTextMessage(stream, mainCommand.SwapPanel(uuidPanel));
-            //  Console.WriteLine("Swap panel: " + ReadPrefMessage(stream));
         }
 
         /// <summary>