diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs
index d51671e..9bca2a7 100644
--- a/DevConsole/Program.cs
+++ b/DevConsole/Program.cs
@@ -12,7 +12,6 @@ namespace DevConsole
     class Program
     {
         public static GsmMgr gsmMgr = new GsmMgr();
-        public static GsmRO gsmRO;
         public static FirelanceMgr flcMgr = new FirelanceMgr();
 
         static void Main(string[] args)
@@ -58,7 +57,6 @@ namespace DevConsole
         private static void ConnectToGsmDb()
         {
             gsmMgr.OpenConnection(@"C:\Users\Dunestorm\Projects\FireLance\GSMParser\games.db", 0);
-            gsmRO = new GsmRO(gsmMgr.Database);
             Console.WriteLine($"GSMParser Connection State: {gsmMgr.IsConnectionOpen()}");
         }
 
@@ -118,7 +116,7 @@ namespace DevConsole
                 case "A":
                     Console.WriteLine("Enter a game ID:");
 
-                    var queryId = gsmRO.LoadRecords<GameEntryModel>(            Gsm.Collections.Columns.GameName,
+                    var queryId = gsmMgr.RO.LoadRecords<GameEntryModel>(            Gsm.Collections.Columns.GameName,
                                                                                 Gsm.Collections.Tables.GameEntry,
                                                                                 Gsm.Collections.Columns.ID,
                                                                                 Console.ReadLine(),
@@ -129,7 +127,7 @@ namespace DevConsole
                 case "B":
                     Console.WriteLine("Enter a game ID:");
 
-                    var queryDirectoryId = gsmRO.LoadRecords<DirectoriesModel>( Gsm.Collections.Options.All,
+                    var queryDirectoryId = gsmMgr.RO.LoadRecords<DirectoriesModel>( Gsm.Collections.Options.All,
                                                                                 Gsm.Collections.Tables.Directories,
                                                                                 Gsm.Collections.Columns.GameID,
                                                                                 Console.ReadLine(),
@@ -139,7 +137,7 @@ namespace DevConsole
                 case "C":
                     Console.WriteLine("Enter game title to search:");
 
-                   var queryGameByName = gsmRO.LoadRecords<GameEntryModel>(     Gsm.Collections.Columns.GameName,
+                   var queryGameByName = gsmMgr.RO.LoadRecords<GameEntryModel>(     Gsm.Collections.Columns.GameName,
                                                                                 Gsm.Collections.Tables.GameEntry,
                                                                                 Gsm.Collections.Columns.GameName,
                                                                                 Console.ReadLine(),
@@ -195,13 +193,13 @@ namespace DevConsole
         private static void FlcWriteMasterGameRecordAction()
         {
             var masterGameRecord = new MasterGameRecordModel();
-            List<DirectoriesModel> directories = gsmRO.LoadRecords<DirectoriesModel>(   Gsm.Collections.Options.All,
+            List<DirectoriesModel> directories = gsmMgr.RO.LoadRecords<DirectoriesModel>(   Gsm.Collections.Options.All,
                                                                                         Gsm.Collections.Tables.Directories,
                                                                                         Gsm.Collections.Columns.GameID,
                                                                                         "600",
                                                                                         true);
 
-            GameEntryModel gameEntry = gsmRO.LoadRecords<GameEntryModel>(               Gsm.Collections.Columns.GameName,
+            GameEntryModel gameEntry = gsmMgr.RO.LoadRecords<GameEntryModel>(               Gsm.Collections.Columns.GameName,
                                                                                         Gsm.Collections.Tables.GameEntry,
                                                                                         Gsm.Collections.Columns.ID,
                                                                                         "600",
diff --git a/GSMParser/GsmMgr.cs b/GSMParser/GsmMgr.cs
index 3ad21b4..08d2975 100644
--- a/GSMParser/GsmMgr.cs
+++ b/GSMParser/GsmMgr.cs
@@ -2,13 +2,22 @@
 using System;
 using System.IO;
 using Firelance.Interfaces;
-using GSMParser.Inferfaces;
 
 namespace Gsm
 {
-    public class GsmMgr : IFlcBaseDBConnection, IGsmSqliteDBConnection
+    public class GsmMgr : IFlcBaseDBConnection
     {
-        public SqliteConnection Database { get; private set; }
+        private SqliteConnection _database;
+        public SqliteConnection Database
+        {
+            get { return _database; }
+            private set
+            {
+                _database = value;
+                RO.SetDatabaseInstance(_database);
+            }
+        }
+        public GsmRO RO = new GsmRO();
 
         public void OpenConnection(string dbLocation, int port)
         {
diff --git a/GSMParser/GsmRO.cs b/GSMParser/GsmRO.cs
index fadd834..cc2196a 100644
--- a/GSMParser/GsmRO.cs
+++ b/GSMParser/GsmRO.cs
@@ -8,7 +8,7 @@ namespace Gsm
     public class GsmRO : IGsmSqliteDBConnection
     {
         public SqliteConnection Database { get; private set; }
-        public GsmRO(SqliteConnection db)
+        public void SetDatabaseInstance(SqliteConnection db)
         {
             Database = db;
         }
diff --git a/GSMParser/Inferfaces/IGsmSqliteDBConnection.cs b/GSMParser/Inferfaces/IGsmSqliteDBConnection.cs
index 2945645..029ccc3 100644
--- a/GSMParser/Inferfaces/IGsmSqliteDBConnection.cs
+++ b/GSMParser/Inferfaces/IGsmSqliteDBConnection.cs
@@ -1,12 +1,9 @@
 using Microsoft.Data.Sqlite;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace GSMParser.Inferfaces
 {
     public interface IGsmSqliteDBConnection
     {
-        public SqliteConnection Database { get; }
+        void SetDatabaseInstance(SqliteConnection db);
     }
 }
\ No newline at end of file