diff --git a/MusicPlayer/MusicPlayer/Main.cs b/MusicPlayer/MusicPlayer/Main.cs
new file mode 100644
index 0000000..ee34205
--- /dev/null
+++ b/MusicPlayer/MusicPlayer/Main.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MusicPlayer
+{
+    class Main
+    {
+        private APIHandler api;
+        private MainForm form;
+        private NetworkHandler nw;
+        private AudioHandler audio;
+
+        public Main(NetworkHandler nw, APIHandler api, MainForm form)
+        {
+            this.nw = nw;
+            this.api = api;
+            this.form = form;
+
+            audio = new AudioHandler();
+
+            Console.WriteLine(api.GetSongURLByID("102"));
+        }
+
+
+    }
+}
diff --git a/MusicPlayer/MusicPlayer/MainForm.Designer.cs b/MusicPlayer/MusicPlayer/MainForm.Designer.cs
index c2d60f1..81bacaa 100644
--- a/MusicPlayer/MusicPlayer/MainForm.Designer.cs
+++ b/MusicPlayer/MusicPlayer/MainForm.Designer.cs
@@ -183,7 +183,7 @@
             this.Controls.Add(this.MenuStrip);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.MenuStrip;
-            this.MinimumSize = new System.Drawing.Size(800, 400);
+            this.MinimumSize = new System.Drawing.Size(800, 500);
             this.Name = "MainForm";
             this.Text = "YJMPD Music Player";
             ((System.ComponentModel.ISupportInitialize)(this.SongsTableView)).EndInit();
diff --git a/MusicPlayer/MusicPlayer/Program.cs b/MusicPlayer/MusicPlayer/Program.cs
index b438603..fb537a0 100644
--- a/MusicPlayer/MusicPlayer/Program.cs
+++ b/MusicPlayer/MusicPlayer/Program.cs
@@ -16,10 +16,13 @@ namespace MusicPlayer
         {
             NetworkHandler nw = new NetworkHandler("http://www.imegumii.nl");
             APIHandler api = new APIHandler(nw);
-            Console.WriteLine(api.GetSongURLByID("102"));
+            MainForm form = new MainForm();
+
+            new Main(nw, api, form);
+
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainForm());
+            Application.Run(form);
         }
     }
 }