diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000000..0d5878aa77
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,23 @@
+clone_depth: 1
+version: '{branch}-{build}'
+configuration: Debug
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+  - inspectcode -> appveyor.yml
+  - packages -> **\packages.config
+install:
+  - cmd: git submodule update --init --recursive
+  - cmd: choco install resharper-clt -y
+  - cmd: choco install nvika -y
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.1/CodeFileSanity.exe
+before_build:
+  - cmd: CodeFileSanity.exe
+  - cmd: nuget restore
+build:
+  project: osu.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+  - cmd: inspectcode /o="inspectcodereport.xml" /caches-home="inspectcode" osu.sln
+  - cmd: NVika parsereport "inspectcodereport.xml"
\ No newline at end of file
diff --git a/osu-framework b/osu-framework
index 5dbb4a5134..a50dd75b11 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 5dbb4a5134dacb2e98ab8f2af219039a72bd32e6
+Subproject commit a50dd75b114da963c75e6a5314099d99140035b8
diff --git a/osu-resources b/osu-resources
index 51f2b9b37f..39657fc606 160000
--- a/osu-resources
+++ b/osu-resources
@@ -1 +1 @@
-Subproject commit 51f2b9b37f38cd349a3dd728a78f8fffcb3a54f5
+Subproject commit 39657fc6066ea3a141ac71cabf67ec9ebf24975c
diff --git a/osu.Desktop.Deploy/App.config b/osu.Desktop.Deploy/App.config
index 33ae53313b..bd464a0453 100644
--- a/osu.Desktop.Deploy/App.config
+++ b/osu.Desktop.Deploy/App.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <configuration>
   <appSettings>
     <add key="StagingFolder" value="Staging" />
diff --git a/osu.Desktop.Deploy/GitHubObject.cs b/osu.Desktop.Deploy/GitHubObject.cs
index f87de5cbdd..a91e7273a4 100644
--- a/osu.Desktop.Deploy/GitHubObject.cs
+++ b/osu.Desktop.Deploy/GitHubObject.cs
@@ -1,8 +1,11 @@
-using Newtonsoft.Json;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using Newtonsoft.Json;
 
 namespace osu.Desktop.Deploy
 {
-    internal class GitHubObject
+    public class GitHubObject
     {
         [JsonProperty(@"id")]
         public int Id;
diff --git a/osu.Desktop.Deploy/GitHubRelease.cs b/osu.Desktop.Deploy/GitHubRelease.cs
index 7e7b04fe58..fe372a7825 100644
--- a/osu.Desktop.Deploy/GitHubRelease.cs
+++ b/osu.Desktop.Deploy/GitHubRelease.cs
@@ -1,8 +1,11 @@
-using Newtonsoft.Json;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using Newtonsoft.Json;
 
 namespace osu.Desktop.Deploy
 {
-    internal class GitHubRelease
+    public class GitHubRelease
     {
         [JsonProperty(@"id")]
         public int Id;
diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs
index 7c6efa7f70..7141b6d52f 100644
--- a/osu.Desktop.Deploy/Program.cs
+++ b/osu.Desktop.Deploy/Program.cs
@@ -1,5 +1,5 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.GitHubusercontent.com/ppy/osu-framework/master/LICENCE
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
 using System.Collections.Generic;
@@ -40,7 +40,7 @@ namespace osu.Desktop.Deploy
         /// <summary>
         /// How many previous build deltas we want to keep when publishing.
         /// </summary>
-        const int keep_delta_count = 3;
+        private const int keep_delta_count = 3;
 
         private static string codeSigningCmd => string.IsNullOrEmpty(codeSigningPassword) ? "" : $"-n \"/a /f {codeSigningCertPath} /p {codeSigningPassword} /t http://timestamp.comodoca.com/authenticode\"";
 
@@ -172,10 +172,10 @@ namespace osu.Desktop.Deploy
             }
 
             //remove excess deltas
-            var deltas = releaseLines.Where(l => l.Filename.Contains("-delta"));
-            if (deltas.Count() > keep_delta_count)
+            var deltas = releaseLines.Where(l => l.Filename.Contains("-delta")).ToArray();
+            if (deltas.Length > keep_delta_count)
             {
-                foreach (var l in deltas.Take(deltas.Count() - keep_delta_count))
+                foreach (var l in deltas.Take(deltas.Length - keep_delta_count))
                 {
                     write($"- Removing old delta {l.Filename}", ConsoleColor.Yellow);
                     File.Delete(Path.Combine(ReleasesFolder, l.Filename));
@@ -342,7 +342,10 @@ namespace osu.Desktop.Deploy
             };
 
             Process p = Process.Start(psi);
+            if (p == null) return false;
+
             string output = p.StandardOutput.ReadToEnd();
+
             if (p.ExitCode == 0) return true;
 
             write(output);
diff --git a/osu.Desktop.Deploy/Properties/AssemblyInfo.cs b/osu.Desktop.Deploy/Properties/AssemblyInfo.cs
index e0c1ad1a43..8df81400c1 100644
--- a/osu.Desktop.Deploy/Properties/AssemblyInfo.cs
+++ b/osu.Desktop.Deploy/Properties/AssemblyInfo.cs
@@ -1,4 +1,7 @@
-using System.Reflection;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj
index 898a991292..6bed6bb049 100644
--- a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj
+++ b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj
@@ -101,6 +101,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
diff --git a/osu.Desktop.Deploy/packages.config b/osu.Desktop.Deploy/packages.config
index 4bbb763e27..59e9e42f45 100644
--- a/osu.Desktop.Deploy/packages.config
+++ b/osu.Desktop.Deploy/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <packages>
   <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net452" />
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net452" />
diff --git a/osu.Desktop.Tests/app.config b/osu.Desktop.Tests/app.config
index b9af3fdc80..855da39b10 100644
--- a/osu.Desktop.Tests/app.config
+++ b/osu.Desktop.Tests/app.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Desktop.Tests/packages.config b/osu.Desktop.Tests/packages.config
index 76b22db9d4..6361ea2050 100644
--- a/osu.Desktop.Tests/packages.config
+++ b/osu.Desktop.Tests/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Desktop.VisualTests/Platform/TestStorage.cs b/osu.Desktop.VisualTests/Platform/TestStorage.cs
index c09c955f9c..c5502d5d5d 100644
--- a/osu.Desktop.VisualTests/Platform/TestStorage.cs
+++ b/osu.Desktop.VisualTests/Platform/TestStorage.cs
@@ -23,7 +23,7 @@ namespace osu.Desktop.VisualTests.Platform
                 platform = new SQLitePlatformWin32();
             else
                 platform = new SQLitePlatformGeneric();
-            return new SQLiteConnection(platform, $@":memory:");
+            return new SQLiteConnection(platform, @":memory:");
         }
     }
 }
\ No newline at end of file
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs
new file mode 100644
index 0000000000..fea9eec6f8
--- /dev/null
+++ b/osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs
@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Screens.Testing;
+using osu.Game.Screens.Select.Options;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseBeatmapOptionsOverlay : TestCase
+    {
+        public override string Description => @"Beatmap options in song select";
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            var overlay = new BeatmapOptionsOverlay();
+
+            Add(overlay);
+
+            AddButton(@"Toggle", overlay.ToggleVisibility);
+        }
+    }
+}
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs b/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
index 9b9e33431f..08765a9b0f 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
@@ -8,18 +8,17 @@ using osu.Game.Overlays;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseChatDisplay : TestCase
+    internal class TestCaseChatDisplay : TestCase
     {
         private ScheduledDelegate messageRequest;
 
-        public override string Name => @"Chat";
         public override string Description => @"Testing chat api and overlay";
 
         public override void Reset()
         {
             base.Reset();
 
-            Add(new ChatOverlay()
+            Add(new ChatOverlay
             {
                 State = Visibility.Visible
             });
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs
index 1bfdc1df8a..c9edcb8a54 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
 using osu.Framework.Screens.Testing;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
@@ -9,12 +8,11 @@ using osu.Game.Overlays.Dialog;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseDialogOverlay : TestCase
+    internal class TestCaseDialogOverlay : TestCase
     {
-        public override string Name => @"Dialog Overlay";
         public override string Description => @"Display dialogs";
 
-        DialogOverlay overlay;
+        private DialogOverlay overlay;
 
         public override void Reset()
         {
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs b/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs
new file mode 100644
index 0000000000..7aa6e1aee1
--- /dev/null
+++ b/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs
@@ -0,0 +1,86 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Framework.Screens.Testing;
+using osu.Game.Screens.Tournament;
+using osu.Game.Screens.Tournament.Teams;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseDrawings : TestCase
+    {
+        public override string Description => "Tournament drawings";
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(new Drawings
+            {
+                TeamList = new TestTeamList(),
+            });
+        }
+
+        private class TestTeamList : ITeamList
+        {
+            public IEnumerable<Team> Teams { get; } = new[]
+            {
+                new Team
+                {
+                    FlagName = "GB",
+                    FullName = "United Kingdom",
+                    Acronym = "UK"
+                },
+                new Team
+                {
+                    FlagName = "FR",
+                    FullName = "France",
+                    Acronym = "FRA"
+                },
+                new Team
+                {
+                    FlagName = "CN",
+                    FullName = "China",
+                    Acronym = "CHN"
+                },
+                new Team
+                {
+                    FlagName = "AU",
+                    FullName = "Australia",
+                    Acronym = "AUS"
+                },
+                new Team
+                {
+                    FlagName = "JP",
+                    FullName = "Japan",
+                    Acronym = "JPN"
+                },
+                new Team
+                {
+                    FlagName = "RO",
+                    FullName = "Romania",
+                    Acronym = "ROM"
+                },
+                new Team
+                {
+                    FlagName = "IT",
+                    FullName = "Italy",
+                    Acronym = "PIZZA"
+                },
+                new Team
+                {
+                    FlagName = "VE",
+                    FullName = "Venezuela",
+                    Acronym = "VNZ"
+                },
+                new Team
+                {
+                    FlagName = "US",
+                    FullName = "United States of America",
+                    Acronym = "USA"
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index dd957ee5a0..ede430478e 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -1,11 +1,11 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Framework.Screens.Testing;
+using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Modes.Catch.UI;
@@ -14,14 +14,12 @@ using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
-using OpenTK;
+using System.Collections.Generic;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseGamefield : TestCase
+    internal class TestCaseGamefield : TestCase
     {
-        public override string Name => @"Gamefield";
-
         public override string Description => @"Showing hitobjects and what not.";
 
         public override void Reset()
@@ -33,7 +31,7 @@ namespace osu.Desktop.VisualTests.Tests
             int time = 500;
             for (int i = 0; i < 100; i++)
             {
-                objects.Add(new HitCircle()
+                objects.Add(new HitCircle
                 {
                     StartTime = time,
                     Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384)),
@@ -57,30 +55,26 @@ namespace osu.Desktop.VisualTests.Tests
                     Clock = new FramedClock(),
                     Children = new Drawable[]
                     {
-                        new OsuHitRenderer
+                        new OsuHitRenderer(beatmap)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.TopLeft,
                             Origin = Anchor.TopLeft
                         },
-                        new TaikoHitRenderer
+                        new TaikoHitRenderer(beatmap)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.TopRight,
                             Origin = Anchor.TopRight
                         },
-                        new CatchHitRenderer
+                        new CatchHitRenderer(beatmap)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft
                         },
-                        new ManiaHitRenderer
+                        new ManiaHitRenderer(beatmap)
                         {
-                            Beatmap = beatmap,
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
index 556d4eceea..436f048e10 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
@@ -17,25 +17,22 @@ using OpenTK.Graphics;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseHitObjects : TestCase
+    internal class TestCaseHitObjects : TestCase
     {
-        public override string Name => @"Hit Objects";
-
-        private StopwatchClock rateAdjustClock;
         private FramedClock framedClock;
 
-        bool auto = false;
+        private bool auto;
 
         public TestCaseHitObjects()
         {
-            rateAdjustClock = new StopwatchClock(true);
+            var rateAdjustClock = new StopwatchClock(true);
             framedClock = new FramedClock(rateAdjustClock);
             playbackSpeed.ValueChanged += delegate { rateAdjustClock.Rate = playbackSpeed.Value; };
         }
 
-        HitObjectType mode = HitObjectType.Slider;
+        private HitObjectType mode = HitObjectType.Slider;
 
-        BindableNumber<double> playbackSpeed = new BindableDouble(0.5) { MinValue = 0, MaxValue = 1 };
+        private BindableNumber<double> playbackSpeed = new BindableDouble(0.5) { MinValue = 0, MaxValue = 1 };
         private Container playfieldContainer;
         private Container approachContainer;
 
@@ -63,7 +60,7 @@ namespace osu.Desktop.VisualTests.Tests
                     add(new DrawableSlider(new Slider
                     {
                         StartTime = framedClock.CurrentTime + 600,
-                        ControlPoints = new List<Vector2>()
+                        ControlPoints = new List<Vector2>
                         {
                             new Vector2(-200, 0),
                             new Vector2(400, 0),
@@ -95,7 +92,7 @@ namespace osu.Desktop.VisualTests.Tests
             AddButton(@"slider", () => load(HitObjectType.Slider));
             AddButton(@"spinner", () => load(HitObjectType.Spinner));
 
-            AddToggle(@"auto", (state) => { auto = state; load(mode); });
+            AddToggle(@"auto", state => { auto = state; load(mode); });
 
             ButtonsContainer.Add(new SpriteText { Text = "Playback Speed" });
             ButtonsContainer.Add(new BasicSliderBar<double>
@@ -124,8 +121,9 @@ namespace osu.Desktop.VisualTests.Tests
             load(mode);
         }
 
-        int depth;
-        void add(DrawableHitObject h)
+        private int depth;
+
+        private void add(DrawableHitObject h)
         {
             h.Anchor = Anchor.Centre;
             h.Depth = depth++;
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
index 11a422d546..9ad439bfbe 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs
@@ -15,10 +15,8 @@ using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseKeyCounter : TestCase
+    internal class TestCaseKeyCounter : TestCase
     {
-        public override string Name => @"KeyCounter";
-
         public override string Description => @"Tests key counter";
 
         public override void Reset()
@@ -32,10 +30,10 @@ namespace osu.Desktop.VisualTests.Tests
                 IsCounting = true,
                 Children = new KeyCounter[]
                 {
-                    new KeyCounterKeyboard(@"Z", Key.Z),
-                    new KeyCounterKeyboard(@"X", Key.X),
-                    new KeyCounterMouse(@"M1", MouseButton.Left),
-                    new KeyCounterMouse(@"M2", MouseButton.Right),
+                    new KeyCounterKeyboard(Key.Z),
+                    new KeyCounterKeyboard(Key.X),
+                    new KeyCounterMouse(MouseButton.Left),
+                    new KeyCounterMouse(MouseButton.Right),
                 },
             };
             BindableInt bindable = new BindableInt { MinValue = 0, MaxValue = 200, Default = 50 };
@@ -43,7 +41,7 @@ namespace osu.Desktop.VisualTests.Tests
             AddButton("Add Random", () =>
             {
                 Key key = (Key)((int)Key.A + RNG.Next(26));
-                kc.Add(new KeyCounterKeyboard(key.ToString(), key));
+                kc.Add(new KeyCounterKeyboard(key));
             });
             ButtonsContainer.Add(new SpriteText { Text = "FadeTime" });
             ButtonsContainer.Add(new TestSliderBar<int>
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs
index 069cf39164..36dc3945e2 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs
@@ -9,9 +9,8 @@ using OpenTK.Graphics;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseMenuButtonSystem : TestCase
+    internal class TestCaseMenuButtonSystem : TestCase
     {
-        public override string Name => @"ButtonSystem";
         public override string Description => @"Main menu button system";
 
         public override void Reset()
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseModSelectOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseModSelectOverlay.cs
new file mode 100644
index 0000000000..eaaa531691
--- /dev/null
+++ b/osu.Desktop.VisualTests/Tests/TestCaseModSelectOverlay.cs
@@ -0,0 +1,35 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Overlays.Mods;
+using osu.Framework.Screens.Testing;
+using osu.Game.Modes;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseModSelectOverlay : TestCase
+    {
+        public override string Description => @"Tests the mod select overlay";
+
+        private ModSelectOverlay modSelect;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(modSelect = new ModSelectOverlay
+            {
+                RelativeSizeAxes = Axes.X,
+                Origin = Anchor.BottomCentre,
+                Anchor = Anchor.BottomCentre,
+            });
+
+            AddButton("Toggle", modSelect.ToggleVisibility);
+            AddButton("osu!", () => modSelect.PlayMode.Value = PlayMode.Osu);
+            AddButton("osu!taiko", () => modSelect.PlayMode.Value = PlayMode.Taiko);
+            AddButton("osu!catch", () => modSelect.PlayMode.Value = PlayMode.Catch);
+            AddButton("osu!mania", () => modSelect.PlayMode.Value = PlayMode.Mania);
+        }
+    }
+}
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs
index 8d9213ee13..f44f662321 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs
@@ -9,9 +9,8 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseMusicController : TestCase
+    internal class TestCaseMusicController : TestCase
     {
-        public override string Name => @"Music Controller";
         public override string Description => @"Tests music controller ui.";
 
         private MusicController mc;
@@ -31,7 +30,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Anchor = Anchor.Centre
             };
             Add(mc);
-            AddToggle(@"Show", (state) => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+            AddToggle(@"Show", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
         }
     }
 }
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs b/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs
index adf222d95d..c3a9064e69 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs
@@ -12,12 +12,11 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseNotificationManager : TestCase
+    internal class TestCaseNotificationManager : TestCase
     {
-        public override string Name => @"Notification Manager";
         public override string Description => @"I handle notifications";
 
-        NotificationManager manager;
+        private NotificationManager manager;
 
         public override void Reset()
         {
@@ -31,7 +30,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Origin = Anchor.TopRight,
             });
 
-            AddToggle(@"show", (state) => manager.State = state ? Visibility.Visible : Visibility.Hidden);
+            AddToggle(@"show", state => manager.State = state ? Visibility.Visible : Visibility.Hidden);
 
             AddButton(@"simple #1", sendNotification1);
             AddButton(@"simple #2", sendNotification2);
@@ -96,7 +95,7 @@ namespace osu.Desktop.VisualTests.Tests
             progressingNotifications.Add(n);
         }
 
-        List<ProgressNotification> progressingNotifications = new List<ProgressNotification>();
+        private List<ProgressNotification> progressingNotifications = new List<ProgressNotification>();
 
         private void sendProgress1()
         {
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseOptions.cs b/osu.Desktop.VisualTests/Tests/TestCaseOptions.cs
index 6afd9ba86d..1b4ecd726a 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseOptions.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseOptions.cs
@@ -6,10 +6,8 @@ using osu.Game.Overlays;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseOptions : TestCase
+    internal class TestCaseOptions : TestCase
     {
-        public override string Name => @"Options";
-
         public override string Description => @"Tests the options overlay";
 
         private OptionsOverlay options;
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs
index 990b8b3775..ad8039bc66 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs
@@ -2,15 +2,13 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Logging;
-using osu.Game.Overlays.Pause;
 using osu.Framework.Screens.Testing;
+using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCasePauseOverlay : TestCase
+    internal class TestCasePauseOverlay : TestCase
     {
-        public override string Name => @"PauseOverlay";
-
         public override string Description => @"Tests the pause overlay";
 
         private PauseOverlay pauseOverlay;
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs
index 6cc2d62402..84bb1cfde6 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System; 
 using System.Collections.Generic;
 using osu.Desktop.VisualTests.Platform;
 using osu.Framework.Screens.Testing;
@@ -12,13 +11,12 @@ using osu.Game.Screens.Select;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCasePlaySongSelect : TestCase
+    internal class TestCasePlaySongSelect : TestCase
     {
         private BeatmapDatabase db, oldDb;
         private TestStorage storage;
         private PlaySongSelect songSelect;
 
-        public override string Name => @"Song Select";
         public override string Description => @"with fake data";
 
         public override void Reset()
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index 7533a1a1e6..ee58d934a4 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Screens.Testing;
 using osu.Game.Beatmaps;
@@ -18,25 +19,30 @@ using OpenTK.Graphics;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCasePlayer : TestCase
+    internal class TestCasePlayer : TestCase
     {
-        private WorkingBeatmap beatmap;
-        public override string Name => @"Player";
+        protected Player Player;
+        private BeatmapDatabase db;
+
 
         public override string Description => @"Showing everything to play the game.";
 
         [BackgroundDependencyLoader]
         private void load(BeatmapDatabase db)
         {
-            var beatmapInfo = db.Query<BeatmapInfo>().Where(b => b.Mode == PlayMode.Osu).FirstOrDefault();
-            if (beatmapInfo != null)
-                beatmap = db.GetWorkingBeatmap(beatmapInfo);
+            this.db = db;
         }
 
         public override void Reset()
         {
             base.Reset();
 
+            WorkingBeatmap beatmap = null;
+
+            var beatmapInfo = db.Query<BeatmapInfo>().FirstOrDefault(b => b.Mode == PlayMode.Osu);
+            if (beatmapInfo != null)
+                beatmap = db.GetWorkingBeatmap(beatmapInfo);
+
             if (beatmap?.Track == null)
             {
                 var objects = new List<HitObject>();
@@ -44,7 +50,7 @@ namespace osu.Desktop.VisualTests.Tests
                 int time = 1500;
                 for (int i = 0; i < 50; i++)
                 {
-                    objects.Add(new HitCircle()
+                    objects.Add(new HitCircle
                     {
                         StartTime = time,
                         Position = new Vector2(i % 4 == 0 || i % 4 == 2 ? 0 : 512,
@@ -82,17 +88,21 @@ namespace osu.Desktop.VisualTests.Tests
                 Colour = Color4.Black,
             });
 
-            Add(new PlayerLoader(new Player
-            {
-                PreferredPlayMode = PlayMode.Osu,
-                Beatmap = beatmap
-            })
+            Add(new PlayerLoader(Player = CreatePlayer(beatmap))
             {
                 Beatmap = beatmap
             });
         }
 
-        class TestWorkingBeatmap : WorkingBeatmap
+        protected virtual Player CreatePlayer(WorkingBeatmap beatmap)
+        {
+            return new Player
+            {
+                Beatmap = beatmap
+            };
+        }
+
+        private class TestWorkingBeatmap : WorkingBeatmap
         {
             public TestWorkingBeatmap(Beatmap beatmap)
                 : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs b/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs
new file mode 100644
index 0000000000..f39da70a16
--- /dev/null
+++ b/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs
@@ -0,0 +1,30 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.IO;
+using osu.Framework.Input.Handlers;
+using osu.Game.Beatmaps;
+using osu.Game.Modes;
+using osu.Game.Screens.Play;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseReplay : TestCasePlayer
+    {
+        private WorkingBeatmap beatmap;
+
+        private InputHandler replay;
+
+        private Func<Stream> getReplayStream;
+
+        public override string Description => @"Testing replay playback.";
+
+        protected override Player CreatePlayer(WorkingBeatmap beatmap)
+        {
+            var player = base.CreatePlayer(beatmap);
+            player.ReplayInputHandler = Ruleset.GetRuleset(beatmap.PlayMode).CreateAutoplayScore(beatmap.Beatmap)?.Replay?.GetInputHandler();
+            return player;
+        }
+    }
+}
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
index c5f7c81585..be313efed3 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
@@ -1,27 +1,19 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using osu.Framework.Screens.Testing;
+using OpenTK;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
+using osu.Framework.Screens.Testing;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Modes.Catch.UI;
-using osu.Game.Modes.Mania.UI;
-using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.Taiko.UI;
 using osu.Game.Modes.UI;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Graphics.Primitives;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseScoreCounter : TestCase
+    internal class TestCaseScoreCounter : TestCase
     {
-        public override string Name => @"ScoreCounter";
-
         public override string Description => @"Tests multiple counters";
 
         public override void Reset()
@@ -37,58 +29,26 @@ namespace osu.Desktop.VisualTests.Tests
                 Origin = Anchor.TopRight,
                 Anchor = Anchor.TopRight,
                 TextSize = 40,
-                Count = 0,
                 Margin = new MarginPadding(20),
             };
             Add(score);
 
-            ComboCounter standardCombo = new OsuComboCounter
+            ComboCounter comboCounter = new StandardComboCounter
             {
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Margin = new MarginPadding(10),
-                Count = 0,
                 TextSize = 40,
             };
-            Add(standardCombo);
+            Add(comboCounter);
 
-            CatchComboCounter catchCombo = new CatchComboCounter
-            {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Count = 0,
-                TextSize = 40,
-            };
-            Add(catchCombo);
-
-            ComboCounter taikoCombo = new TaikoComboCounter
-            {
-                Origin = Anchor.BottomCentre,
-                Anchor = Anchor.Centre,
-                Position = new Vector2(0, -160),
-                Count = 0,
-                TextSize = 40,
-            };
-            Add(taikoCombo);
-
-            ManiaComboCounter maniaCombo = new ManiaComboCounter
-            {
-                Origin = Anchor.Centre,
-                Anchor = Anchor.Centre,
-                Position = new Vector2(0, -80),
-                Count = 0,
-                TextSize = 40,
-            };
-            Add(maniaCombo);
-
-
-            PercentageCounter accuracyCombo = new PercentageCounter
+            PercentageCounter accuracyCounter = new PercentageCounter
             {
                 Origin = Anchor.TopRight,
                 Anchor = Anchor.TopRight,
                 Position = new Vector2(-20, 60),
             };
-            Add(accuracyCombo);
+            Add(accuracyCounter);
 
             StarCounter stars = new StarCounter
             {
@@ -110,50 +70,27 @@ namespace osu.Desktop.VisualTests.Tests
 
             AddButton(@"Reset all", delegate
             {
-                score.Count = 0;
-                standardCombo.Count = 0;
-                taikoCombo.Count = 0;
-                maniaCombo.Count = 0;
-                catchCombo.Count = 0;
+                score.Current.Value = 0;
+                comboCounter.Current.Value = 0;
                 numerator = denominator = 0;
-                accuracyCombo.SetFraction(0, 0);
+                accuracyCounter.SetFraction(0, 0);
                 stars.Count = 0;
                 starsLabel.Text = stars.Count.ToString("0.00");
             });
 
             AddButton(@"Hit! :D", delegate
             {
-                score.Count += 300 + (ulong)(300.0 * (standardCombo.Count > 0 ? standardCombo.Count - 1 : 0) / 25.0);
-                standardCombo.Count++;
-                taikoCombo.Count++;
-                maniaCombo.Count++;
-                catchCombo.CatchFruit(new Color4(
-                    Math.Max(0.5f, RNG.NextSingle()),
-                    Math.Max(0.5f, RNG.NextSingle()),
-                    Math.Max(0.5f, RNG.NextSingle()),
-                    1)
-                );
+                score.Current.Value += 300 + (ulong)(300.0 * (comboCounter.Current > 0 ? comboCounter.Current - 1 : 0) / 25.0);
+                comboCounter.Increment();
                 numerator++; denominator++;
-                accuracyCombo.SetFraction(numerator, denominator);
+                accuracyCounter.SetFraction(numerator, denominator);
             });
 
             AddButton(@"miss...", delegate
             {
-                standardCombo.Roll();
-                taikoCombo.Roll();
-                maniaCombo.Roll();
-                catchCombo.Roll();
+                comboCounter.Current.Value = 0;
                 denominator++;
-                accuracyCombo.SetFraction(numerator, denominator);
-            });
-
-            AddButton(@"mania hold", delegate
-            {
-                if (!maniaHold)
-                    maniaCombo.HoldStart();
-                else
-                    maniaCombo.HoldEnd();
-                maniaHold = !maniaHold;
+                accuracyCounter.SetFraction(numerator, denominator);
             });
 
             AddButton(@"Alter stars", delegate
@@ -165,11 +102,8 @@ namespace osu.Desktop.VisualTests.Tests
             AddButton(@"Stop counters", delegate
             {
                 score.StopRolling();
-                standardCombo.StopRolling();
-                catchCombo.StopRolling();
-                taikoCombo.StopRolling();
-                maniaCombo.StopRolling();
-                accuracyCombo.StopRolling();
+                comboCounter.StopRolling();
+                accuracyCounter.StopRolling();
                 stars.StopAnimation();
             });
         }
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs b/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs
index ce3650fe61..3ba657d60a 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs
@@ -12,10 +12,8 @@ using OpenTK.Graphics;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseTextAwesome : TestCase
+    internal class TestCaseTextAwesome : TestCase
     {
-        public override string Name => @"TextAwesome";
-
         public override string Description => @"Tests display of icons";
 
         public override void Reset()
@@ -24,7 +22,7 @@ namespace osu.Desktop.VisualTests.Tests
 
             FillFlowContainer flow;
 
-            Add(flow = new FillFlowContainer()
+            Add(flow = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Size = new Vector2(0.5f),
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs b/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs
index ff65ac619e..4694a6c6ea 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs
@@ -7,9 +7,8 @@ using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseTwoLayerButton : TestCase
+    internal class TestCaseTwoLayerButton : TestCase
     {
-        public override string Name => @"TwoLayerButton";
         public override string Description => @"Back and skip and what not";
 
         public override void Reset()
diff --git a/osu.Desktop.VisualTests/VisualTestGame.cs b/osu.Desktop.VisualTests/VisualTestGame.cs
index 3128824da2..6a51a892ad 100644
--- a/osu.Desktop.VisualTests/VisualTestGame.cs
+++ b/osu.Desktop.VisualTests/VisualTestGame.cs
@@ -7,13 +7,13 @@ using osu.Game.Screens.Backgrounds;
 
 namespace osu.Desktop.VisualTests
 {
-    class VisualTestGame : OsuGameBase
+    internal class VisualTestGame : OsuGameBase
     {
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            (new BackgroundScreenDefault() { Depth = 10 }).LoadAsync(this, AddInternal);
+            new BackgroundScreenDefault { Depth = 10 }.LoadAsync(this, AddInternal);
 
             // Have to construct this here, rather than in the constructor, because
             // we depend on some dependencies to be loaded within OsuGameBase.load().
diff --git a/osu.Desktop.VisualTests/app.config b/osu.Desktop.VisualTests/app.config
index b9af3fdc80..855da39b10 100644
--- a/osu.Desktop.VisualTests/app.config
+++ b/osu.Desktop.VisualTests/app.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index 85d6d7055e..bea56b5cd0 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -86,6 +86,10 @@
       <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="SharpCompress, Version=0.15.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpCompress.0.15.1\lib\net45\SharpCompress.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
@@ -179,6 +183,7 @@
     <Compile Include="Benchmark.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Tests\TestCaseChatDisplay.cs" />
+    <Compile Include="Tests\TestCaseDrawings.cs" />
     <Compile Include="Tests\TestCaseGamefield.cs" />
     <Compile Include="Tests\TestCaseMusicController.cs" />
     <Compile Include="Tests\TestCaseNotificationManager.cs" />
@@ -186,6 +191,7 @@
     <Compile Include="Tests\TestCaseHitObjects.cs" />
     <Compile Include="Tests\TestCaseKeyCounter.cs" />
     <Compile Include="Tests\TestCaseMenuButtonSystem.cs" />
+    <Compile Include="Tests\TestCaseReplay.cs" />
     <Compile Include="Tests\TestCaseScoreCounter.cs" />
     <Compile Include="Tests\TestCaseTextAwesome.cs" />
     <Compile Include="Tests\TestCasePlaySongSelect.cs" />
@@ -194,7 +200,9 @@
     <Compile Include="Platform\TestStorage.cs" />
     <Compile Include="Tests\TestCaseOptions.cs" />
     <Compile Include="Tests\TestCasePauseOverlay.cs" />
+    <Compile Include="Tests\TestCaseModSelectOverlay.cs" />
     <Compile Include="Tests\TestCaseDialogOverlay.cs" />
+    <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
diff --git a/osu.Desktop.VisualTests/packages.config b/osu.Desktop.VisualTests/packages.config
index 3da209ee61..c3f267ac89 100644
--- a/osu.Desktop.VisualTests/packages.config
+++ b/osu.Desktop.VisualTests/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
@@ -6,6 +7,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
+  <package id="SharpCompress" version="0.15.1" targetFramework="net45" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLiteNetExtensions" version="1.3.0" targetFramework="net45" />
diff --git a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs
index b8bfb63a08..0ef448cafe 100644
--- a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs
+++ b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs
@@ -17,16 +17,16 @@ namespace osu.Desktop.Beatmaps.IO
     {
         public static void Register() => AddReader<LegacyFilesystemReader>((storage, path) => Directory.Exists(path));
 
-        private string basePath { get; set; }
-        private Beatmap firstMap { get; set; }
+        private string basePath { get; }
+        private Beatmap firstMap { get; }
 
         public LegacyFilesystemReader(string path)
         {
             basePath = path;
-            BeatmapFilenames = Directory.GetFiles(basePath, @"*.osu").Select(f => Path.GetFileName(f)).ToArray();
+            BeatmapFilenames = Directory.GetFiles(basePath, @"*.osu").Select(Path.GetFileName).ToArray();
             if (BeatmapFilenames.Length == 0)
                 throw new FileNotFoundException(@"This directory contains no beatmaps");
-            StoryboardFilename = Directory.GetFiles(basePath, @"*.osb").Select(f => Path.GetFileName(f)).FirstOrDefault();
+            StoryboardFilename = Directory.GetFiles(basePath, @"*.osb").Select(Path.GetFileName).FirstOrDefault();
             using (var stream = new StreamReader(GetStream(BeatmapFilenames[0])))
             {
                 var decoder = BeatmapDecoder.GetDecoder(stream);
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index d9b9c31617..3b827f2809 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -9,16 +9,16 @@ using osu.Framework.Desktop.Platform;
 using osu.Desktop.Overlays;
 using System.Reflection;
 using System.Drawing;
+using System.IO;
+using System.Threading.Tasks;
 using osu.Game.Screens.Menu;
 
 namespace osu.Desktop
 {
-    class OsuGameDesktop : OsuGame
+    internal class OsuGameDesktop : OsuGame
     {
         private VersionManager versionManager;
 
-        public override bool IsDeployedBuild => versionManager.IsDeployedBuild;
-
         public OsuGameDesktop(string[] args = null)
             : base(args)
         {
@@ -44,7 +44,7 @@ namespace osu.Desktop
             if (desktopWindow != null)
             {
                 desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
-                desktopWindow.Title = @"osu!lazer";
+                desktopWindow.Title = Name;
 
                 desktopWindow.DragEnter += dragEnter;
                 desktopWindow.DragDrop += dragDrop;
@@ -54,22 +54,29 @@ namespace osu.Desktop
         private void dragDrop(DragEventArgs e)
         {
             // this method will only be executed if e.Effect in dragEnter gets set to something other that None.
-            var dropData = e.Data.GetData(DataFormats.FileDrop) as object[];
+            var dropData = (object[])e.Data.GetData(DataFormats.FileDrop);
             var filePaths = dropData.Select(f => f.ToString()).ToArray();
-            ImportBeatmapsAsync(filePaths);
+
+            if (filePaths.All(f => Path.GetExtension(f) == @".osz"))
+                Task.Run(() => BeatmapDatabase.Import(filePaths));
+            else if (filePaths.All(f => Path.GetExtension(f) == @".osr"))
+                Task.Run(() =>
+                {
+                    var score = ScoreDatabase.ReadReplayFile(filePaths.First());
+                    Schedule(() => LoadScore(score));
+                });
         }
 
+        private static readonly string[] allowed_extensions = { @".osz", @".osr" };
+
         private void dragEnter(DragEventArgs e)
         {
             // dragDrop will only be executed if e.Effect gets set to something other that None in this method.
             bool isFile = e.Data.GetDataPresent(DataFormats.FileDrop);
             if (isFile)
             {
-                var paths = (e.Data.GetData(DataFormats.FileDrop) as object[]).Select(f => f.ToString()).ToArray();
-                if (paths.Any(p => !p.EndsWith(".osz")))
-                    e.Effect = DragDropEffects.None;
-                else
-                    e.Effect = DragDropEffects.Copy;
+                var paths = ((object[])e.Data.GetData(DataFormats.FileDrop)).Select(f => f.ToString()).ToArray();
+                e.Effect = allowed_extensions.Any(ext => paths.All(p => p.EndsWith(ext))) ? DragDropEffects.Copy : DragDropEffects.None;
             }
         }
     }
diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs
index aff8bb0d7b..b93636331a 100644
--- a/osu.Desktop/Overlays/VersionManager.cs
+++ b/osu.Desktop/Overlays/VersionManager.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -11,13 +10,14 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using Squirrel;
-using System.Reflection;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
 using System.Net.Http;
+using osu.Framework.Logging;
+using osu.Game;
 
 namespace osu.Desktop.Overlays
 {
@@ -26,16 +26,12 @@ namespace osu.Desktop.Overlays
         private UpdateManager updateManager;
         private NotificationManager notificationManager;
 
-        AssemblyName assembly = Assembly.GetEntryAssembly().GetName();
-
-        public bool IsDeployedBuild => assembly.Version.Major > 0;
-
         protected override bool HideOnEscape => false;
 
         public override bool HandleInput => false;
 
         [BackgroundDependencyLoader]
-        private void load(NotificationManager notification, OsuColour colours, TextureStore textures)
+        private void load(NotificationManager notification, OsuColour colours, TextureStore textures, OsuGameBase game)
         {
             notificationManager = notification;
 
@@ -44,29 +40,18 @@ namespace osu.Desktop.Overlays
             Origin = Anchor.BottomCentre;
             Alpha = 0;
 
-            bool isDebug = false;
-            Debug.Assert(isDebug = true);
-
-            string version;
-            if (!IsDeployedBuild)
-            {
-                version = @"local " + (isDebug ? @"debug" : @"release");
-            }
-            else
-                version = $@"{assembly.Version.Major}.{assembly.Version.Minor}.{assembly.Version.Build}";
-
             Children = new Drawable[]
             {
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
                         new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Right,
+                            Direction = FillDirection.Horizontal,
                             Spacing = new Vector2(5),
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
@@ -75,12 +60,12 @@ namespace osu.Desktop.Overlays
                                 new OsuSpriteText
                                 {
                                     Font = @"Exo2.0-Bold",
-                                    Text = $@"osu!lazer"
+                                    Text = game.Name
                                 },
                                 new OsuSpriteText
                                 {
-                                    Colour = isDebug ? colours.Red : Color4.White,
-                                    Text = version
+                                    Colour = game.IsDebug ? colours.Red : Color4.White,
+                                    Text = game.Version
                                 },
                             }
                         },
@@ -91,7 +76,7 @@ namespace osu.Desktop.Overlays
                             TextSize = 12,
                             Colour = colours.Yellow,
                             Font = @"Venera",
-                            Text = $@"Development Build"
+                            Text = @"Development Build"
                         },
                         new Sprite
                         {
@@ -103,7 +88,7 @@ namespace osu.Desktop.Overlays
                 }
             };
 
-            if (IsDeployedBuild)
+            if (game.IsDeployedBuild)
                 checkForUpdateAsync();
         }
 
@@ -159,15 +144,21 @@ namespace osu.Desktop.Overlays
 
                     Schedule(() => notification.State = ProgressNotificationState.Completed);
                 }
-                catch (Exception)
+                catch (Exception e)
                 {
                     if (useDeltaPatching)
                     {
+                        Logger.Error(e, @"delta patching failed!");
+
                         //could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
                         //try again without deltas.
                         checkForUpdateAsync(false, notification);
                         scheduleRetry = false;
                     }
+                    else
+                    {
+                        Logger.Error(e, @"update failed!");
+                    }
                 }
             }
             catch (HttpRequestException)
@@ -196,9 +187,9 @@ namespace osu.Desktop.Overlays
         {
         }
 
-        class UpdateProgressNotification : ProgressNotification
+        private class UpdateProgressNotification : ProgressNotification
         {
-            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification(this)
+            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification()
             {
                 Text = @"Update ready to install. Click to restart!",
                 Activated = () =>
@@ -221,6 +212,7 @@ namespace osu.Desktop.Overlays
                     new TextAwesome
                     {
                         Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
                         Icon = FontAwesome.fa_upload,
                         Colour = Color4.White,
                     }
diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index 3171e474dc..ddf58ac363 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -29,7 +29,7 @@ namespace osu.Desktop
             {
                 if (!host.IsPrimaryInstance)
                 {
-                    var importer = new BeatmapImporter(host);
+                    var importer = new BeatmapIPCChannel(host);
                     // Restore the cwd so relative paths given at the command line work correctly
                     Directory.SetCurrentDirectory(cwd);
                     foreach (var file in args)
diff --git a/osu.Desktop/app.config b/osu.Desktop/app.config
index b3c333c783..1ff0a7f133 100644
--- a/osu.Desktop/app.config
+++ b/osu.Desktop/app.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 527a027ca2..7e85f09d8c 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -101,8 +101,8 @@
       <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
diff --git a/osu.Desktop/osu.nuspec b/osu.Desktop/osu.nuspec
index 2888f7c040..4c529f57e5 100644
--- a/osu.Desktop/osu.nuspec
+++ b/osu.Desktop/osu.nuspec
@@ -17,7 +17,8 @@
     </metadata>
     <files>
       <file src="*.exe" target="lib\net45\" exclude="**vshost**"/>
-      <file src="*.dll" target="lib\net45\"/>
+      <file src="*.dll" target="lib\net45\"/>
+      <file src="*.config" target="lib\net45\"/>
       <file src="x86\*.dll" target="lib\net45\x86\"/>
       <file src="x64\*.dll" target="lib\net45\x64\"/>
     </files>
diff --git a/osu.Desktop/packages.config b/osu.Desktop/packages.config
index bdeaf1de89..50a70fb6ef 100644
--- a/osu.Desktop/packages.config
+++ b/osu.Desktop/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
@@ -7,6 +8,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
   <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
   <package id="Splat" version="2.0.0" targetFramework="net45" />
   <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs
new file mode 100644
index 0000000000..6460751570
--- /dev/null
+++ b/osu.Game.Modes.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Catch.Objects;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Catch.Beatmaps
+{
+    internal class CatchBeatmapConverter : IBeatmapConverter<CatchBaseHit>
+    {
+        public Beatmap<CatchBaseHit> Convert(Beatmap original)
+        {
+            return new Beatmap<CatchBaseHit>(original)
+            {
+                HitObjects = new List<CatchBaseHit>() // Todo: Convert HitObjects
+            };
+        }
+    }
+}
diff --git a/osu.Game.Modes.Catch/CatchDifficultyCalculator.cs b/osu.Game.Modes.Catch/CatchDifficultyCalculator.cs
index ccc4097d59..53c6f5c2ce 100644
--- a/osu.Game.Modes.Catch/CatchDifficultyCalculator.cs
+++ b/osu.Game.Modes.Catch/CatchDifficultyCalculator.cs
@@ -2,26 +2,23 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Catch.Beatmaps;
 using osu.Game.Modes.Catch.Objects;
-using osu.Game.Modes.Objects;
-using System;
 using System.Collections.Generic;
 
 namespace osu.Game.Modes.Catch
 {
     public class CatchDifficultyCalculator : DifficultyCalculator<CatchBaseHit>
     {
-        protected override PlayMode PlayMode => PlayMode.Catch;
-
         public CatchDifficultyCalculator(Beatmap beatmap) : base(beatmap)
         {
         }
 
-        protected override HitObjectConverter<CatchBaseHit> Converter => new CatchConverter();
-
-        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        protected override double CalculateInternal(Dictionary<string, string> categoryDifficulty)
         {
             return 0;
         }
+
+        protected override IBeatmapConverter<CatchBaseHit> CreateBeatmapConverter() => new CatchBeatmapConverter();
     }
 }
\ No newline at end of file
diff --git a/osu.Game.Modes.Catch/CatchMod.cs b/osu.Game.Modes.Catch/CatchMod.cs
new file mode 100644
index 0000000000..07d6d3469e
--- /dev/null
+++ b/osu.Game.Modes.Catch/CatchMod.cs
@@ -0,0 +1,62 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Modes.Catch
+{
+    public class CatchModNoFail : ModNoFail
+    {
+
+    }
+
+    public class CatchModEasy : ModEasy
+    {
+
+    }
+
+    public class CatchModHidden : ModHidden
+    {
+        public override string Description => @"Play with no approach circles and fading notes for a slight score advantage.";
+        public override double ScoreMultiplier => 1.06;
+    }
+
+    public class CatchModHardRock : ModHardRock
+    {
+        public override double ScoreMultiplier => 1.12;
+        public override bool Ranked => true;
+    }
+
+    public class CatchModSuddenDeath : ModSuddenDeath
+    {
+
+    }
+
+    public class CatchModDoubleTime : ModDoubleTime
+    {
+        public override double ScoreMultiplier => 1.06;
+    }
+
+    public class CatchModRelax : ModRelax
+    {
+        public override string Description => @"Use the mouse to control the catcher.";
+    }
+
+    public class CatchModHalfTime : ModHalfTime
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+
+    public class CatchModNightcore : ModNightcore
+    {
+        public override double ScoreMultiplier => 1.06;
+    }
+
+    public class CatchModFlashlight : ModFlashlight
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+
+    public class CatchModPerfect : ModPerfect
+    {
+
+    }
+}
diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs
index fd778d1ce6..08edeb7bcb 100644
--- a/osu.Game.Modes.Catch/CatchRuleset.cs
+++ b/osu.Game.Modes.Catch/CatchRuleset.cs
@@ -1,26 +1,92 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using OpenTK.Input;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Modes.Catch.UI;
 using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
-using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
+using System.Collections.Generic;
 
 namespace osu.Game.Modes.Catch
 {
     public class CatchRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
+        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new CatchHitRenderer(beatmap);
 
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new CatchHitRenderer { Beatmap = beatmap };
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.DifficultyReduction:
+                    return new Mod[]
+                    {
+                        new CatchModEasy(),
+                        new CatchModNoFail(),
+                        new CatchModHalfTime(),
+                    };
+
+                case ModType.DifficultyIncrease:
+                    return new Mod[]
+                    {
+                        new CatchModHardRock(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new CatchModSuddenDeath(),
+                                new CatchModPerfect(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new CatchModDoubleTime(),
+                                new CatchModNightcore(),
+                            },
+                        },
+                        new CatchModHidden(),
+                        new CatchModFlashlight(),
+                    };
+
+                case ModType.Special:
+                    return new Mod[]
+                    {
+                        new CatchModRelax(),
+                        null,
+                        null,
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ModAutoplay(),
+                                new ModCinema(),
+                            },
+                        },
+                    };
+
+                default:
+                    return new Mod[] { };
+            }
+        }
 
         protected override PlayMode PlayMode => PlayMode.Catch;
 
+        public override string Description => "osu!catch";
+
         public override FontAwesome Icon => FontAwesome.fa_osu_fruits_o;
 
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null;
+        public override IEnumerable<KeyCounter> CreateGameplayKeys() => new KeyCounter[]
+        {
+            new KeyCounterKeyboard(Key.ShiftLeft),
+            new KeyCounterMouse(MouseButton.Left),
+            new KeyCounterMouse(MouseButton.Right)
+        };
+
+        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
 
         public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
 
diff --git a/osu.Game.Modes.Catch/Objects/CatchConverter.cs b/osu.Game.Modes.Catch/Objects/CatchConverter.cs
index d8c2df320f..31ddc73f61 100644
--- a/osu.Game.Modes.Catch/Objects/CatchConverter.cs
+++ b/osu.Game.Modes.Catch/Objects/CatchConverter.cs
@@ -8,7 +8,7 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Modes.Catch.Objects
 {
-    class CatchConverter : HitObjectConverter<CatchBaseHit>
+    internal class CatchConverter : HitObjectConverter<CatchBaseHit>
     {
         public override List<CatchBaseHit> Convert(Beatmap beatmap)
         {
diff --git a/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs
index dea8bdfae2..542bdeb3c3 100644
--- a/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs
+++ b/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs
@@ -10,7 +10,7 @@ using OpenTK;
 
 namespace osu.Game.Modes.Catch.Objects.Drawable
 {
-    class DrawableFruit : Sprite
+    internal class DrawableFruit : Sprite
     {
         private CatchBaseHit h;
 
diff --git a/osu.Game.Modes.Catch/UI/CatchComboCounter.cs b/osu.Game.Modes.Catch/UI/CatchComboCounter.cs
deleted file mode 100644
index e0a07dc295..0000000000
--- a/osu.Game.Modes.Catch/UI/CatchComboCounter.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Modes.Osu.UI;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Catch.UI
-{
-    /// <summary>
-    /// Similar to Standard, but without the 'x' and has tinted pop-ups. Used in osu!catch.
-    /// </summary>
-    public class CatchComboCounter : OsuComboCounter
-    {
-        protected override bool CanPopOutWhileRolling => true;
-
-        protected virtual double FadeOutDelay => 1000;
-        protected override double FadeOutDuration => 300;
-
-        protected override string FormatCount(ulong count)
-        {
-            return $@"{count:#,0}";
-        }
-
-        private void animateFade()
-        {
-            Show();
-            Delay(FadeOutDelay);
-            FadeOut(FadeOutDuration);
-            DelayReset();
-        }
-
-        protected override void OnCountChange(ulong currentValue, ulong newValue)
-        {
-            if (newValue != 0)
-                animateFade();
-            base.OnCountChange(currentValue, newValue);
-        }
-
-        protected override void OnCountRolling(ulong currentValue, ulong newValue)
-        {
-            if (!IsRolling)
-            {
-                PopOutCount.Colour = DisplayedCountSpriteText.Colour;
-                FadeOut(FadeOutDuration);
-            }
-            base.OnCountRolling(currentValue, newValue);
-        }
-
-        protected override void OnCountIncrement(ulong currentValue, ulong newValue)
-        {
-            animateFade();
-            base.OnCountIncrement(currentValue, newValue);
-        }
-
-        /// <summary>
-        /// Increaces counter and tints pop-out before animation.
-        /// </summary>
-        /// <param name="colour">Last grabbed fruit colour.</param>
-        public void CatchFruit(Color4 colour)
-        {
-            PopOutCount.Colour = colour;
-            Count++;
-        }
-    }
-}
diff --git a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
index 0d06ce29a7..1537227d8f 100644
--- a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
+++ b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
@@ -1,8 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Catch.Beatmaps;
 using osu.Game.Modes.Catch.Objects;
-using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.UI;
 
@@ -10,10 +11,15 @@ namespace osu.Game.Modes.Catch.UI
 {
     public class CatchHitRenderer : HitRenderer<CatchBaseHit>
     {
-        protected override HitObjectConverter<CatchBaseHit> Converter => new CatchConverter();
+        public CatchHitRenderer(Beatmap beatmap)
+            : base(beatmap)
+        {
+        }
 
-        protected override Playfield CreatePlayfield() => new CatchPlayfield();
+        protected override IBeatmapConverter<CatchBaseHit> CreateBeatmapConverter() => new CatchBeatmapConverter();
 
-        protected override DrawableHitObject GetVisualRepresentation(CatchBaseHit h) => null;// new DrawableFruit(h);
+        protected override Playfield<CatchBaseHit> CreatePlayfield() => new CatchPlayfield();
+
+        protected override DrawableHitObject<CatchBaseHit> GetVisualRepresentation(CatchBaseHit h) => null;// new DrawableFruit(h);
     }
 }
diff --git a/osu.Game.Modes.Catch/UI/CatchPlayfield.cs b/osu.Game.Modes.Catch/UI/CatchPlayfield.cs
index cf69ab4fe2..c9c3df8197 100644
--- a/osu.Game.Modes.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Modes.Catch/UI/CatchPlayfield.cs
@@ -3,12 +3,13 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Modes.Catch.Objects;
 using osu.Game.Modes.UI;
 using OpenTK;
 
 namespace osu.Game.Modes.Catch.UI
 {
-    public class CatchPlayfield : Playfield
+    public class CatchPlayfield : Playfield<CatchBaseHit>
     {
         public CatchPlayfield()
         {
diff --git a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
index 6b37963da1..10abb312fc 100644
--- a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
+++ b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
@@ -47,6 +47,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Beatmaps\CatchBeatmapConverter.cs" />
     <Compile Include="CatchDifficultyCalculator.cs" />
     <Compile Include="Objects\CatchBaseHit.cs" />
     <Compile Include="Objects\CatchConverter.cs" />
@@ -54,10 +55,10 @@
     <Compile Include="Objects\Droplet.cs" />
     <Compile Include="Objects\Fruit.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\CatchComboCounter.cs" />
     <Compile Include="UI\CatchHitRenderer.cs" />
     <Compile Include="UI\CatchPlayfield.cs" />
     <Compile Include="CatchRuleset.cs" />
+    <Compile Include="CatchMod.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\osu.licenseheader">
diff --git a/osu.Game.Modes.Catch/packages.config b/osu.Game.Modes.Catch/packages.config
index 4031dd62a8..08fca09c35 100644
--- a/osu.Game.Modes.Catch/packages.config
+++ b/osu.Game.Modes.Catch/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
new file mode 100644
index 0000000000..0f42da4ac8
--- /dev/null
+++ b/osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Mania.Objects;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Mania.Beatmaps
+{
+    internal class ManiaBeatmapConverter : IBeatmapConverter<ManiaBaseHit>
+    {
+        public Beatmap<ManiaBaseHit> Convert(Beatmap original)
+        {
+            return new Beatmap<ManiaBaseHit>(original)
+            {
+                HitObjects = new List<ManiaBaseHit>() // Todo: Implement
+            };
+        }
+    }
+}
diff --git a/osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs b/osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs
index 975b78c215..02a5a3acdc 100644
--- a/osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Modes.Mania/ManiaDifficultyCalculator.cs
@@ -2,29 +2,24 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Mania.Beatmaps;
 using osu.Game.Modes.Mania.Objects;
-using osu.Game.Modes.Objects;
-using System;
 using System.Collections.Generic;
 
 namespace osu.Game.Modes.Mania
 {
     public class ManiaDifficultyCalculator : DifficultyCalculator<ManiaBaseHit>
     {
-        protected override PlayMode PlayMode => PlayMode.Mania;
-
-        private int columns;
-
-        public ManiaDifficultyCalculator(Beatmap beatmap, int columns = 5) : base(beatmap)
+        public ManiaDifficultyCalculator(Beatmap beatmap)
+            : base(beatmap)
         {
-            this.columns = columns;
         }
 
-        protected override HitObjectConverter<ManiaBaseHit> Converter => new ManiaConverter(columns);
-
-        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        protected override double CalculateInternal(Dictionary<string, string> categoryDifficulty)
         {
             return 0;
         }
+
+        protected override IBeatmapConverter<ManiaBaseHit> CreateBeatmapConverter() => new ManiaBeatmapConverter();
     }
 }
\ No newline at end of file
diff --git a/osu.Game.Modes.Mania/ManiaMod.cs b/osu.Game.Modes.Mania/ManiaMod.cs
new file mode 100644
index 0000000000..d52db2977c
--- /dev/null
+++ b/osu.Game.Modes.Mania/ManiaMod.cs
@@ -0,0 +1,146 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Graphics;
+
+namespace osu.Game.Modes.Mania
+{
+    public class ManiaModNoFail : ModNoFail
+    {
+
+    }
+
+    public class ManiaModEasy : ModEasy
+    {
+
+    }
+
+    public class ManiaModHidden : ModHidden
+    {
+        public override string Description => @"The notes fade out before you hit them!";
+        public override double ScoreMultiplier => 1.0;
+        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight) };
+    }
+
+    public class ManiaModHardRock : ModHardRock
+    {
+        public override double ScoreMultiplier => 1.0;
+    }
+
+    public class ManiaModSuddenDeath : ModSuddenDeath
+    {
+
+    }
+
+    public class ManiaModDoubleTime : ModDoubleTime
+    {
+        public override double ScoreMultiplier => 1.0;
+    }
+
+    public class ManiaModHalfTime : ModHalfTime
+    {
+        public override double ScoreMultiplier => 0.3;
+    }
+
+    public class ManiaModNightcore : ModNightcore
+    {
+        public override double ScoreMultiplier => 1.0;
+    }
+
+    public class ManiaModFlashlight : ModFlashlight
+    {
+        public override double ScoreMultiplier => 1.0;
+        public override Type[] IncompatibleMods => new[] { typeof(ModHidden) };
+    }
+
+    public class ManiaModPerfect : ModPerfect
+    {
+
+    }
+
+    public class ManiaModFadeIn : Mod
+    {
+        public override string Name => "FadeIn";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hidden;
+        public override double ScoreMultiplier => 1;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight) };
+    }
+
+    public class ManiaModRandom : Mod
+    {
+        public override string Name => "Random";
+        public override string Description => @"Shuffle around the notes!";
+        public override double ScoreMultiplier => 1;
+    }
+
+    public abstract class ManiaKeyMod : Mod
+    {
+        public abstract int KeyCount { get; }
+        public override double ScoreMultiplier => 1; // TODO: Implement the mania key mod score multiplier
+        public override bool Ranked => true;
+    }
+
+    public class ManiaModKey1 : ManiaKeyMod
+    {
+        public override int KeyCount => 1;
+        public override string Name => "1K";
+    }
+
+    public class ManiaModKey2 : ManiaKeyMod
+    {
+        public override int KeyCount => 2;
+        public override string Name => "2K";
+    }
+
+    public class ManiaModKey3 : ManiaKeyMod
+    {
+        public override int KeyCount => 3;
+        public override string Name => "3K";
+    }
+
+    public class ManiaModKey4 : ManiaKeyMod
+    {
+        public override int KeyCount => 4;
+        public override string Name => "4K";
+    }
+
+    public class ManiaModKey5 : ManiaKeyMod
+    {
+        public override int KeyCount => 5;
+        public override string Name => "5K";
+    }
+
+    public class ManiaModKey6 : ManiaKeyMod
+    {
+        public override int KeyCount => 6;
+        public override string Name => "6K";
+    }
+
+    public class ManiaModKey7 : ManiaKeyMod
+    {
+        public override int KeyCount => 7;
+        public override string Name => "7K";
+    }
+
+    public class ManiaModKey8 : ManiaKeyMod
+    {
+        public override int KeyCount => 8;
+        public override string Name => "8K";
+    }
+
+    public class ManiaModKey9 : ManiaKeyMod
+    {
+        public override int KeyCount => 9;
+        public override string Name => "9K";
+    }
+
+    public class ManiaModKeyCoop : Mod
+    {
+        public override string Name => "KeyCoop";
+        public override string Description => @"Double the key amount, double the fun!";
+        public override double ScoreMultiplier => 1;
+        public override bool Ranked => true;
+    }
+}
diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs
index bbf22086c0..e6e9cfd799 100644
--- a/osu.Game.Modes.Mania/ManiaRuleset.cs
+++ b/osu.Game.Modes.Mania/ManiaRuleset.cs
@@ -1,26 +1,107 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Modes.Mania.UI;
 using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
-using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
+using System.Collections.Generic;
 
 namespace osu.Game.Modes.Mania
 {
     public class ManiaRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
+        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new ManiaHitRenderer(beatmap);
 
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new ManiaHitRenderer { Beatmap = beatmap };
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.DifficultyReduction:
+                    return new Mod[]
+                    {
+                        new ManiaModEasy(),
+                        new ManiaModNoFail(),
+                        new ManiaModHalfTime(),
+                    };
+
+                case ModType.DifficultyIncrease:
+                    return new Mod[]
+                    {
+                        new ManiaModHardRock(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModSuddenDeath(),
+                                new ManiaModPerfect(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModDoubleTime(),
+                                new ManiaModNightcore(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModFadeIn(),
+                                new ManiaModHidden(),
+                            }
+                        },
+                        new ManiaModFlashlight(),
+                    };
+
+                case ModType.Special:
+                    return new Mod[]
+                    {
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModKey4(),
+                                new ManiaModKey5(),
+                                new ManiaModKey6(),
+                                new ManiaModKey7(),
+                                new ManiaModKey8(),
+                                new ManiaModKey9(),
+                                new ManiaModKey1(),
+                                new ManiaModKey2(),
+                                new ManiaModKey3(),
+                            },
+                        },
+                        new ManiaModRandom(),
+                        new ManiaModKeyCoop(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ModAutoplay(),
+                                new ModCinema(),
+                            },
+                        },
+                    };
+
+                default:
+                    return new Mod[] { };
+            }
+        }
 
         protected override PlayMode PlayMode => PlayMode.Mania;
 
+        public override string Description => "osu!mania";
+
         public override FontAwesome Icon => FontAwesome.fa_osu_mania_o;
 
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null;
+        public override IEnumerable<KeyCounter> CreateGameplayKeys() => new KeyCounter[] { /* Todo: Should be keymod specific */ };
+
+        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
 
         public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
 
diff --git a/osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs b/osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs
index c682a0dacb..92e73191a4 100644
--- a/osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs
+++ b/osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs
@@ -26,8 +26,8 @@ namespace osu.Game.Modes.Mania.Objects.Drawable
         {
             Texture = textures.Get(@"Menu/logo");
 
-            Transforms.Add(new TransformPositionY() { StartTime = note.StartTime - 200, EndTime = note.StartTime, StartValue = -0.1f, EndValue = 0.9f });
-            Transforms.Add(new TransformAlpha() { StartTime = note.StartTime + note.Duration + 200, EndTime = note.StartTime + note.Duration + 400, StartValue = 1, EndValue = 0 });
+            Transforms.Add(new TransformPositionY { StartTime = note.StartTime - 200, EndTime = note.StartTime, StartValue = -0.1f, EndValue = 0.9f });
+            Transforms.Add(new TransformAlpha { StartTime = note.StartTime + note.Duration + 200, EndTime = note.StartTime + note.Duration + 400, StartValue = 1, EndValue = 0 });
             Expire(true);
         }
     }
diff --git a/osu.Game.Modes.Mania/Objects/ManiaConverter.cs b/osu.Game.Modes.Mania/Objects/ManiaConverter.cs
index 654a8fa343..7e1183c0e3 100644
--- a/osu.Game.Modes.Mania/Objects/ManiaConverter.cs
+++ b/osu.Game.Modes.Mania/Objects/ManiaConverter.cs
@@ -9,7 +9,7 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Modes.Mania.Objects
 {
-    class ManiaConverter : HitObjectConverter<ManiaBaseHit>
+    internal class ManiaConverter : HitObjectConverter<ManiaBaseHit>
     {
         private readonly int columns;
 
diff --git a/osu.Game.Modes.Mania/UI/ManiaComboCounter.cs b/osu.Game.Modes.Mania/UI/ManiaComboCounter.cs
deleted file mode 100644
index b0bd19d6eb..0000000000
--- a/osu.Game.Modes.Mania/UI/ManiaComboCounter.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transforms;
-using osu.Game.Modes.Taiko.UI;
-using OpenTK.Graphics;
-
-namespace osu.Game.Modes.Mania.UI
-{
-    /// <summary>
-    /// Similar to osu!taiko, with a pop-out animation when failing (rolling). Used in osu!mania.
-    /// </summary>
-    public class ManiaComboCounter : TaikoComboCounter
-    {
-        protected ushort KeysHeld = 0;
-
-        protected Color4 OriginalColour;
-
-        protected Color4 TintColour => Color4.Orange;
-        protected EasingTypes TintEasing => EasingTypes.None;
-        protected int TintDuration => 500;
-
-        protected Color4 PopOutColor => Color4.Red;
-        protected override float PopOutInitialAlpha => 1.0f;
-        protected override double PopOutDuration => 300;
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            PopOutCount.Anchor = Anchor.BottomCentre;
-            PopOutCount.Origin = Anchor.Centre;
-            PopOutCount.FadeColour(PopOutColor, 0);
-            OriginalColour = DisplayedCountSpriteText.Colour;
-        }
-
-        protected override void OnCountRolling(ulong currentValue, ulong newValue)
-        {
-            if (!IsRolling && newValue < currentValue)
-            {
-                PopOutCount.Text = FormatCount(currentValue);
-
-                PopOutCount.FadeTo(PopOutInitialAlpha);
-                PopOutCount.ScaleTo(1.0f);
-
-                PopOutCount.FadeOut(PopOutDuration, PopOutEasing);
-                PopOutCount.ScaleTo(PopOutScale, PopOutDuration, PopOutEasing);
-            }
-
-            base.OnCountRolling(currentValue, newValue);
-        }
-
-        /// <summary>
-        /// Tints text while holding a key.
-        /// </summary>
-        /// <remarks>
-        /// Does not alter combo. This has to be done depending of the scoring system.
-        /// (i.e. v1 = each period of time; v2 = when starting and ending a key hold)
-        /// </remarks>
-        public void HoldStart()
-        {
-            if (KeysHeld == 0)
-                DisplayedCountSpriteText.FadeColour(TintColour, TintDuration, TintEasing);
-            KeysHeld++;
-        }
-
-        /// <summary>
-        /// Ends tinting.
-        /// </summary>
-        public void HoldEnd()
-        {
-            KeysHeld--;
-            if (KeysHeld == 0)
-                DisplayedCountSpriteText.FadeColour(OriginalColour, TintDuration, TintEasing);
-        }
-    }
-}
diff --git a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
index 59c79f0d03..911742b222 100644
--- a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
+++ b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
@@ -1,8 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Mania.Beatmaps;
 using osu.Game.Modes.Mania.Objects;
-using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.UI;
 
@@ -12,16 +13,17 @@ namespace osu.Game.Modes.Mania.UI
     {
         private readonly int columns;
 
-        public ManiaHitRenderer(int columns = 5)
+        public ManiaHitRenderer(Beatmap beatmap, int columns = 5)
+            : base(beatmap)
         {
             this.columns = columns;
         }
 
-        protected override HitObjectConverter<ManiaBaseHit> Converter => new ManiaConverter(columns);
+        protected override IBeatmapConverter<ManiaBaseHit> CreateBeatmapConverter() => new ManiaBeatmapConverter();
 
-        protected override Playfield CreatePlayfield() => new ManiaPlayfield(columns);
+        protected override Playfield<ManiaBaseHit> CreatePlayfield() => new ManiaPlayfield(columns);
 
-        protected override DrawableHitObject GetVisualRepresentation(ManiaBaseHit h)
+        protected override DrawableHitObject<ManiaBaseHit> GetVisualRepresentation(ManiaBaseHit h)
         {
             return null;
             //return new DrawableNote(h)
diff --git a/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs b/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs
index 2772b09e16..ab3c231917 100644
--- a/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs
@@ -3,19 +3,17 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Modes.Mania.Objects;
 using osu.Game.Modes.UI;
 using OpenTK;
 using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Mania.UI
 {
-    public class ManiaPlayfield : Playfield
+    public class ManiaPlayfield : Playfield<ManiaBaseHit>
     {
-        private readonly int columns;
-
         public ManiaPlayfield(int columns)
         {
-            this.columns = columns;
             RelativeSizeAxes = Axes.Both;
             Size = new Vector2(columns / 20f, 1f);
             Anchor = Anchor.BottomCentre;
@@ -24,7 +22,7 @@ namespace osu.Game.Modes.Mania.UI
             Add(new Box { RelativeSizeAxes = Axes.Both, Alpha = 0.5f });
 
             for (int i = 0; i < columns; i++)
-                Add(new Box()
+                Add(new Box
                 {
                     RelativeSizeAxes = Axes.Y,
                     Size = new Vector2(2, 1),
diff --git a/osu.Game.Modes.Mania/app.config b/osu.Game.Modes.Mania/app.config
index b9af3fdc80..855da39b10 100644
--- a/osu.Game.Modes.Mania/app.config
+++ b/osu.Game.Modes.Mania/app.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
index b9b7e35ae7..66e46f9e48 100644
--- a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
+++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
@@ -47,6 +47,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Beatmaps\ManiaBeatmapConverter.cs" />
     <Compile Include="ManiaDifficultyCalculator.cs" />
     <Compile Include="Objects\Drawable\DrawableNote.cs" />
     <Compile Include="Objects\HoldNote.cs" />
@@ -54,10 +55,10 @@
     <Compile Include="Objects\ManiaConverter.cs" />
     <Compile Include="Objects\Note.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\ManiaComboCounter.cs" />
     <Compile Include="UI\ManiaHitRenderer.cs" />
     <Compile Include="UI\ManiaPlayfield.cs" />
     <Compile Include="ManiaRuleset.cs" />
+    <Compile Include="ManiaMod.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
@@ -85,6 +86,7 @@
     <None Include="OpenTK.dll.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/osu.Game.Modes.Mania/packages.config b/osu.Game.Modes.Mania/packages.config
index 4031dd62a8..08fca09c35 100644
--- a/osu.Game.Modes.Mania/packages.config
+++ b/osu.Game.Modes.Mania/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Osu/Objects/OsuHitObjectConverter.cs b/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
similarity index 85%
rename from osu.Game.Modes.Osu/Objects/OsuHitObjectConverter.cs
rename to osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
index 989a5caffb..33d4562032 100644
--- a/osu.Game.Modes.Osu/Objects/OsuHitObjectConverter.cs
+++ b/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -1,35 +1,45 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Game.Modes.Objects;
-using osu.Game.Beatmaps;
-using osu.Game.Modes.Osu.Objects.Drawables;
-using OpenTK;
 
-namespace osu.Game.Modes.Osu.Objects
+using OpenTK;
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Osu.Objects;
+using osu.Game.Modes.Osu.Objects.Drawables;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Osu.Beatmaps
 {
-    public class OsuHitObjectConverter : HitObjectConverter<OsuHitObject>
+    internal class OsuBeatmapConverter : IBeatmapConverter<OsuHitObject>
     {
-        public override List<OsuHitObject> Convert(Beatmap beatmap)
+        public Beatmap<OsuHitObject> Convert(Beatmap original)
         {
-            List<OsuHitObject> output = new List<OsuHitObject>();
+            return new Beatmap<OsuHitObject>(original)
+            {
+                HitObjects = convertHitObject(original.HitObjects, original.BeatmapInfo?.StackLeniency ?? 0.7f)
+            };
+        }
+
+        private List<OsuHitObject> convertHitObject(List<HitObject> hitObjects, float stackLeniency)
+        {
+            List<OsuHitObject> converted = new List<OsuHitObject>();
 
             int combo = 0;
-            foreach (HitObject h in beatmap.HitObjects)
+            foreach (HitObject h in hitObjects)
             {
                 if (h.NewCombo) combo = 0;
 
                 h.ComboIndex = combo++;
-                output.Add(h as OsuHitObject);
+                converted.Add(h as OsuHitObject);
             }
 
-            UpdateStacking(output, beatmap.BeatmapInfo?.StackLeniency ?? 0.7f);
+            updateStacking(converted, stackLeniency);
 
-            return output;
+            return converted;
         }
 
-        public static void UpdateStacking(List<OsuHitObject> hitObjects, float stackLeniency, int startIndex = 0, int endIndex = -1)
+        private void updateStacking(List<OsuHitObject> hitObjects, float stackLeniency, int startIndex = 0, int endIndex = -1)
         {
             if (endIndex == -1)
                 endIndex = hitObjects.Count - 1;
@@ -59,7 +69,7 @@ namespace osu.Game.Modes.Osu.Objects
                         break;
 
                     if (Vector2.Distance(stackBaseObject.Position, objectN.Position) < stackDistance ||
-                        (stackBaseObject is Slider && Vector2.Distance(stackBaseObject.EndPosition, objectN.Position) < stackDistance))
+                        stackBaseObject is Slider && Vector2.Distance(stackBaseObject.EndPosition, objectN.Position) < stackDistance)
                     {
                         stackBaseIndex = n;
 
@@ -171,6 +181,5 @@ namespace osu.Game.Modes.Osu.Objects
                 }
             }
         }
-
     }
 }
diff --git a/osu.Game.Modes.Osu/Objects/CircularArcApproximator.cs b/osu.Game.Modes.Osu/Objects/CircularArcApproximator.cs
index 3c112576b6..0f6f335279 100644
--- a/osu.Game.Modes.Osu/Objects/CircularArcApproximator.cs
+++ b/osu.Game.Modes.Osu/Objects/CircularArcApproximator.cs
@@ -79,12 +79,9 @@ namespace osu.Game.Modes.Osu.Objects
             // We select the amount of points for the approximation by requiring the discrete curvature
             // to be smaller than the provided tolerance. The exact angle required to meet the tolerance
             // is: 2 * Math.Acos(1 - TOLERANCE / r)
-            if (2 * r <= tolerance)
-                // This special case is required for extremely short sliders where the radius is smaller than
-                // the tolerance. This is a pathological rather than a realistic case.
-                amountPoints = 2;
-            else
-                amountPoints = Math.Max(2, (int)Math.Ceiling(thetaRange / (2 * Math.Acos(1 - tolerance / r))));
+            // The special case is required for extremely short sliders where the radius is smaller than
+            // the tolerance. This is a pathological rather than a realistic case.
+            amountPoints = 2 * r <= tolerance ? 2 : Math.Max(2, (int)Math.Ceiling(thetaRange / (2 * Math.Acos(1 - tolerance / r))));
 
             List<Vector2> output = new List<Vector2>(amountPoints);
 
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPoint.cs b/osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPoint.cs
index 1f03a87c1d..935f3e01fd 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPoint.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPoint.cs
@@ -3,11 +3,11 @@
 
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
-using osu.Game.Graphics;
 
 namespace osu.Game.Modes.Osu.Objects.Drawables.Connections
 {
@@ -17,7 +17,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Connections
         public double EndTime;
         public Vector2 EndPosition;
 
-        const float width = 8;
+        private const float width = 8;
 
         public FollowPoint()
         {
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index b57f0881bc..6ef9bc100a 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -1,12 +1,11 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
-using osu.Game.Modes.Osu.Objects.Drawables.Connections;
 using System;
 using System.Collections.Generic;
+using OpenTK;
 
-namespace osu.Game.Modes.Osu.Objects.Drawables
+namespace osu.Game.Modes.Osu.Objects.Drawables.Connections
 {
     public class FollowPointRenderer : ConnectionRenderer<OsuHitObject>
     {
@@ -74,13 +73,13 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
                     for (int d = (int)(PointDistance * 1.5); d < distance - PointDistance; d += PointDistance)
                     {
-                        float fraction = ((float)d / distance);
+                        float fraction = (float)d / distance;
                         Vector2 pointStartPosition = startPosition + (fraction - 0.1f) * distanceVector;
                         Vector2 pointEndPosition = startPosition + fraction * distanceVector;
                         double fadeOutTime = startTime + fraction * duration;
                         double fadeInTime = fadeOutTime - PreEmpt;
 
-                        Add(new FollowPoint()
+                        Add(new FollowPoint
                         {
                             StartTime = fadeInTime,
                             EndTime = fadeOutTime,
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
index 9197472f92..e10fa91e6f 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                         return true;
                     },
                 },
-                number = new NumberPiece()
+                number = new NumberPiece
                 {
                     Text = h is Spinner ? "S" : (HitObject.ComboIndex + 1).ToString(),
                 },
@@ -59,7 +59,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                 {
                     Colour = osuObject.Colour,
                 },
-                ApproachCircle = new ApproachCircle()
+                ApproachCircle = new ApproachCircle
                 {
                     Colour = osuObject.Colour,
                 }
@@ -69,33 +69,23 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             Size = circle.DrawSize;
         }
 
-        double hit50 = 150;
-        double hit100 = 80;
-        double hit300 = 30;
-
         protected override void CheckJudgement(bool userTriggered)
         {
             if (!userTriggered)
             {
-                if (Judgement.TimeOffset > hit50)
+                if (Judgement.TimeOffset > HitObject.HitWindowFor(OsuScoreResult.Hit50))
                     Judgement.Result = HitResult.Miss;
                 return;
             }
 
             double hitOffset = Math.Abs(Judgement.TimeOffset);
 
-            OsuJudgementInfo osuJudgement = Judgement as OsuJudgementInfo;
+            OsuJudgementInfo osuJudgement = (OsuJudgementInfo)Judgement;
 
-            if (hitOffset < hit50)
+            if (hitOffset < HitObject.HitWindowFor(OsuScoreResult.Hit50))
             {
                 Judgement.Result = HitResult.Hit;
-
-                if (hitOffset < hit300)
-                    osuJudgement.Score = OsuScoreResult.Hit300;
-                else if (hitOffset < hit100)
-                    osuJudgement.Score = OsuScoreResult.Hit100;
-                else if (hitOffset < hit50)
-                    osuJudgement.Score = OsuScoreResult.Hit50;
+                osuJudgement.Score = HitObject.ScoreResultForOffset(hitOffset);
             }
             else
                 Judgement.Result = HitResult.Miss;
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index c7cc7cfdd7..4b436dd82f 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -2,12 +2,11 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.ComponentModel;
-using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
 
 namespace osu.Game.Modes.Osu.Objects.Drawables
 {
-    public class DrawableOsuHitObject : DrawableHitObject
+    public class DrawableOsuHitObject : DrawableHitObject<OsuHitObject>
     {
         public const float TIME_PREEMPT = 600;
         public const float TIME_FADEIN = 400;
@@ -18,7 +17,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
         {
         }
 
-        public override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo { MaxScore = OsuScoreResult.Hit300 };
+        protected override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo { MaxScore = OsuScoreResult.Hit300 };
 
         protected override void UpdateState(ArmedState state)
         {
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
index 907ce8da63..94c150bd3e 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
@@ -21,13 +21,14 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         private Container<DrawableSliderTick> ticks;
 
-        SliderBody body;
-        SliderBall ball;
+        private SliderBody body;
+        private SliderBall ball;
 
-        SliderBouncer bouncer1, bouncer2;
+        private SliderBouncer bouncer2;
 
         public DrawableSlider(Slider s) : base(s)
         {
+            SliderBouncer bouncer1;
             slider = s;
 
             Children = new Drawable[]
@@ -94,7 +95,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
         // pass all input through.
         public override bool Contains(Vector2 screenSpacePos) => true;
 
-        int currentRepeat;
+        private int currentRepeat;
 
         protected override void Update()
         {
@@ -102,8 +103,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
             double progress = MathHelper.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
 
-            int repeat = (int)(progress * slider.RepeatCount);
-            progress = (progress * slider.RepeatCount) % 1;
+            int repeat = slider.RepeatAt(progress);
+            progress = slider.CurveProgressAt(progress);
 
             if (repeat > currentRepeat)
             {
@@ -112,9 +113,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                 currentRepeat = repeat;
             }
 
-            if (repeat % 2 == 1)
-                progress = 1 - progress;
-
             bouncer2.Position = slider.Curve.PositionAt(body.SnakedEnd ?? 0);
 
             //todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
@@ -127,8 +125,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void CheckJudgement(bool userTriggered)
         {
-            var j = Judgement as OsuJudgementInfo;
-            var sc = initialCircle.Judgement as OsuJudgementInfo;
+            var j = (OsuJudgementInfo)Judgement;
+            var sc = (OsuJudgementInfo)initialCircle.Judgement;
 
             if (!userTriggered && Time.Current >= HitObject.EndTime)
             {
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
index 5fe9e44b41..7c5fa4a092 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
-        public override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo { MaxScore = OsuScoreResult.SliderTick };
+        protected override JudgementInfo CreateJudgementInfo() => new OsuJudgementInfo { MaxScore = OsuScoreResult.SliderTick };
 
         public DrawableSliderTick(SliderTick sliderTick) : base(sliderTick)
         {
@@ -71,7 +71,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void CheckJudgement(bool userTriggered)
         {
-            var j = Judgement as OsuJudgementInfo;
+            var j = (OsuJudgementInfo)Judgement;
 
             if (Judgement.TimeOffset >= 0)
             {
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
index 8c491dec9c..cfebd11809 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
         {
             if (Time.Current < HitObject.StartTime) return;
 
-            var j = Judgement as OsuJudgementInfo;
+            var j = (OsuJudgementInfo)Judgement;
 
             disc.ScaleTo(Interpolation.ValueAt(Math.Sqrt(Progress), scaleToCircle, Vector2.One, 0, 1), 100);
 
@@ -108,9 +108,9 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             }
         }
 
-        private Vector2 scaleToCircle => (circle.Scale * circle.DrawWidth / DrawWidth) * 0.95f;
+        private Vector2 scaleToCircle => circle.Scale * circle.DrawWidth / DrawWidth * 0.95f;
 
-        private float spinsPerMinuteNeeded = 100 + (5 * 15); //TODO: read per-map OD and place it on the 5
+        private float spinsPerMinuteNeeded = 100 + 5 * 15; //TODO: read per-map OD and place it on the 5
 
         private float rotationsNeeded => (float)(spinsPerMinuteNeeded * (spinner.EndTime - spinner.StartTime) / 60000f);
 
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs b/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
index 95bc0954de..39a7862db6 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             AutoSizeAxes = Axes.Both;
             Origin = Anchor.Centre;
 
-            Direction = FillDirection.Down;
+            Direction = FillDirection.Vertical;
             Spacing = new Vector2(0, 2);
             Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;
 
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs
index 23f878d491..2a503e3dec 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 
         public CirclePiece()
         {
-            Size = new Vector2(128);
+            Size = new Vector2((float)OsuHitObject.OBJECT_RADIUS * 2);
             Masking = true;
             CornerRadius = Size.X / 2;
 
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
index 02116fc157..8d8aadbb60 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
@@ -1,10 +1,10 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using OpenTK.Graphics;
 
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs
index 1b9ddd2236..49785efd38 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         private readonly Slider slider;
         private Box follow;
 
-        const float width = 128;
+        private const float width = 128;
 
         public SliderBall(Slider slider)
         {
@@ -81,7 +81,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             return base.OnMouseMove(state);
         }
 
-        bool tracking;
+        private bool tracking;
         public bool Tracking
         {
             get { return tracking; }
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index c2c31d247e..34dec34cb4 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -28,7 +29,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             set { Disc.Colour = value; }
         }
 
-        Color4 completeColour;
+        private Color4 completeColour;
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
@@ -36,7 +37,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             completeColour = colours.YellowLight.Opacity(0.8f);
         }
 
-        class SpinnerBorder : Container
+        private class SpinnerBorder : Container
         {
             public SpinnerBorder()
             {
@@ -115,7 +116,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             };
         }
 
-        bool tracking;
+        private bool tracking;
         public bool Tracking
         {
             get { return tracking; }
@@ -129,7 +130,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             }
         }
 
-        bool complete;
+        private bool complete;
         public bool Complete
         {
             get { return complete; }
diff --git a/osu.Game.Modes.Osu/Objects/OsuHitObject.cs b/osu.Game.Modes.Osu/Objects/OsuHitObject.cs
index cbf9a3de9c..ddcdae7be0 100644
--- a/osu.Game.Modes.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Modes.Osu/Objects/OsuHitObject.cs
@@ -5,11 +5,19 @@ using System;
 using osu.Game.Modes.Objects;
 using OpenTK;
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Osu.Objects.Drawables;
 
 namespace osu.Game.Modes.Osu.Objects
 {
     public abstract class OsuHitObject : HitObject
     {
+        public const double OBJECT_RADIUS = 64;
+
+        private const double hittable_range = 300;
+        private const double hit_window_50 = 150;
+        private const double hit_window_100 = 80;
+        private const double hit_window_300 = 30;
+
         public Vector2 Position { get; set; }
 
         public Vector2 StackedPosition => Position + StackOffset;
@@ -22,10 +30,38 @@ namespace osu.Game.Modes.Osu.Objects
 
         public Vector2 StackOffset => new Vector2(StackHeight * Scale * -6.4f);
 
+        public double Radius => OBJECT_RADIUS * Scale;
+
         public float Scale { get; set; } = 1;
 
         public abstract HitObjectType Type { get; }
 
+        public double HitWindowFor(OsuScoreResult result)
+        {
+            switch (result)
+            {
+                default:
+                    return 300;
+                case OsuScoreResult.Hit50:
+                    return 150;
+                case OsuScoreResult.Hit100:
+                    return 80;
+                case OsuScoreResult.Hit300:
+                    return 30;
+            }
+        }
+
+        public OsuScoreResult ScoreResultForOffset(double offset)
+        {
+            if (offset < HitWindowFor(OsuScoreResult.Hit300))
+                return OsuScoreResult.Hit300;
+            if (offset < HitWindowFor(OsuScoreResult.Hit100))
+                return OsuScoreResult.Hit100;
+            if (offset < HitWindowFor(OsuScoreResult.Hit50))
+                return OsuScoreResult.Hit50;
+            return OsuScoreResult.Miss;
+        }
+
         public override void SetDefaultsFromBeatmap(Beatmap beatmap)
         {
             base.SetDefaultsFromBeatmap(beatmap);
diff --git a/osu.Game.Modes.Osu/Objects/OsuHitObjectDifficulty.cs b/osu.Game.Modes.Osu/Objects/OsuHitObjectDifficulty.cs
index 4f0dac7407..c67c28b526 100644
--- a/osu.Game.Modes.Osu/Objects/OsuHitObjectDifficulty.cs
+++ b/osu.Game.Modes.Osu/Objects/OsuHitObjectDifficulty.cs
@@ -8,7 +8,7 @@ using System.Linq;
 
 namespace osu.Game.Modes.Osu.Objects
 {
-    class OsuHitObjectDifficulty
+    internal class OsuHitObjectDifficulty
     {
         /// <summary>
         /// Factor by how much speed / aim strain decays per second.
@@ -63,7 +63,7 @@ namespace osu.Game.Modes.Osu.Objects
                 MaxCombo += slider.Ticks.Count();
 
             // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
-            scalingFactor = (52.0f / circleRadius);
+            scalingFactor = 52.0f / circleRadius;
             if (circleRadius < 30)
             {
                 float smallCircleBonus = Math.Min(30.0f - circleRadius, 5.0f) / 50.0f;
@@ -130,7 +130,7 @@ namespace osu.Game.Modes.Osu.Objects
                     else if (distance > almost_diameter)
                         return 1.2 + 0.4 * (distance - almost_diameter) / (stream_spacing_threshold - almost_diameter);
                     else if (distance > almost_diameter / 2)
-                        return 0.95 + 0.25 * (distance - (almost_diameter / 2)) / (almost_diameter / 2);
+                        return 0.95 + 0.25 * (distance - almost_diameter / 2) / (almost_diameter / 2);
                     else
                         return 0.95;
 
diff --git a/osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs b/osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
index e8818db1d5..3a8ab00f10 100644
--- a/osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
+++ b/osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
@@ -30,18 +30,15 @@ namespace osu.Game.Modes.Osu.Objects
                     break;
                 case HitObjectType.Slider:
                     CurveTypes curveType = CurveTypes.Catmull;
-                    int repeatCount;
                     double length = 0;
-                    List<Vector2> points = new List<Vector2>();
-
-                    points.Add(new Vector2(int.Parse(split[0]), int.Parse(split[1])));
+                    List<Vector2> points = new List<Vector2> { new Vector2(int.Parse(split[0]), int.Parse(split[1])) };
 
                     string[] pointsplit = split[5].Split('|');
-                    for (int i = 0; i < pointsplit.Length; i++)
+                    foreach (string t in pointsplit)
                     {
-                        if (pointsplit[i].Length == 1)
+                        if (t.Length == 1)
                         {
-                            switch (pointsplit[i])
+                            switch (t)
                             {
                                 case @"C":
                                     curveType = CurveTypes.Catmull;
@@ -59,7 +56,7 @@ namespace osu.Game.Modes.Osu.Objects
                             continue;
                         }
 
-                        string[] temp = pointsplit[i].Split(':');
+                        string[] temp = t.Split(':');
                         Vector2 v = new Vector2(
                             (int)Convert.ToDouble(temp[0], CultureInfo.InvariantCulture),
                             (int)Convert.ToDouble(temp[1], CultureInfo.InvariantCulture)
@@ -67,12 +64,10 @@ namespace osu.Game.Modes.Osu.Objects
                         points.Add(v);
                     }
 
-                    repeatCount = Convert.ToInt32(split[6], CultureInfo.InvariantCulture);
+                    int repeatCount = Convert.ToInt32(split[6], CultureInfo.InvariantCulture);
 
                     if (repeatCount > 9000)
-                    {
-                        throw new ArgumentOutOfRangeException("wacky man");
-                    }
+                        throw new ArgumentOutOfRangeException(nameof(repeatCount), @"Repeat count is way too high");
 
                     if (split.Length > 7)
                         length = Convert.ToDouble(split[7], CultureInfo.InvariantCulture);
diff --git a/osu.Game.Modes.Osu/Objects/Slider.cs b/osu.Game.Modes.Osu/Objects/Slider.cs
index 5f6c50fd72..88abb68d0a 100644
--- a/osu.Game.Modes.Osu/Objects/Slider.cs
+++ b/osu.Game.Modes.Osu/Objects/Slider.cs
@@ -14,7 +14,32 @@ namespace osu.Game.Modes.Osu.Objects
     {
         public override double EndTime => StartTime + RepeatCount * Curve.Length / Velocity;
 
-        public override Vector2 EndPosition => RepeatCount % 2 == 0 ? Position : Curve.PositionAt(1);
+        public override Vector2 EndPosition => PositionAt(1);
+
+        /// <summary>
+        /// Computes the position on the slider at a given progress that ranges from 0 (beginning of the slider)
+        /// to 1 (end of the slider). This includes repeat logic.
+        /// </summary>
+        /// <param name="progress">Ranges from 0 (beginning of the slider) to 1 (end of the slider).</param>
+        /// <returns></returns>
+        public Vector2 PositionAt(double progress) => Curve.PositionAt(CurveProgressAt(progress));
+
+        /// <summary>
+        /// Find the current progress along the curve, accounting for repeat logic.
+        /// </summary>
+        public double CurveProgressAt(double progress)
+        {
+            var p = progress * RepeatCount % 1;
+            if (RepeatAt(progress) % 2 == 1)
+                p = 1 - p;
+            return p;
+        }
+
+        /// <summary>
+        /// Determine which repeat of the slider we are on at a given progress.
+        /// Range is 0..RepeatCount where 0 is the first run.
+        /// </summary>
+        public int RepeatAt(double progress) => (int)(progress * RepeatCount);
 
         private int stackHeight;
         public override int StackHeight
diff --git a/osu.Game.Modes.Osu/Objects/SliderCurve.cs b/osu.Game.Modes.Osu/Objects/SliderCurve.cs
index 3b52a41b8c..6c65e7fa37 100644
--- a/osu.Game.Modes.Osu/Objects/SliderCurve.cs
+++ b/osu.Game.Modes.Osu/Objects/SliderCurve.cs
@@ -59,10 +59,9 @@ namespace osu.Game.Modes.Osu.Objects
                 if (i == ControlPoints.Count - 1 || ControlPoints[i] == ControlPoints[i + 1])
                 {
                     List<Vector2> subpath = calculateSubpath(subControlPoints);
-                    for (int j = 0; j < subpath.Count; ++j)
-                        // Only add those vertices that add a new segment to the path.
-                        if (calculatedPath.Count == 0 || calculatedPath.Last() != subpath[j])
-                            calculatedPath.Add(subpath[j]);
+                    foreach (Vector2 t in subpath)
+                        if (calculatedPath.Count == 0 || calculatedPath.Last() != t)
+                            calculatedPath.Add(t);
 
                     subControlPoints.Clear();
                 }
@@ -175,7 +174,7 @@ namespace osu.Game.Modes.Osu.Objects
             path.Clear();
 
             int i = 0;
-            for (; i < calculatedPath.Count && cumulativeLength[i] < d0; ++i) ;
+            for (; i < calculatedPath.Count && cumulativeLength[i] < d0; ++i) { }
 
             path.Add(interpolateVertices(i, d0) + Offset);
 
@@ -186,10 +185,10 @@ namespace osu.Game.Modes.Osu.Objects
         }
 
         /// <summary>
-        /// Computes the position on the slider at a given progress that ranges from 0 (beginning of the slider)
-        /// to 1 (end of the slider).
+        /// Computes the position on the slider at a given progress that ranges from 0 (beginning of the curve)
+        /// to 1 (end of the curve).
         /// </summary>
-        /// <param name="progress">Ranges from 0 (beginning of the slider) to 1 (end of the slider).</param>
+        /// <param name="progress">Ranges from 0 (beginning of the curve) to 1 (end of the curve).</param>
         /// <returns></returns>
         public Vector2 PositionAt(double progress)
         {
diff --git a/osu.Game.Modes.Osu/OsuAutoReplay.cs b/osu.Game.Modes.Osu/OsuAutoReplay.cs
new file mode 100644
index 0000000000..953f131797
--- /dev/null
+++ b/osu.Game.Modes.Osu/OsuAutoReplay.cs
@@ -0,0 +1,299 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Osu.Objects;
+using OpenTK;
+using System;
+using osu.Framework.Graphics.Transforms;
+using osu.Game.Modes.Osu.Objects.Drawables;
+using osu.Framework.MathUtils;
+using System.Diagnostics;
+
+namespace osu.Game.Modes.Osu
+{
+    public class OsuAutoReplay : LegacyReplay
+    {
+        private static readonly Vector2 spinner_centre = new Vector2(256, 192);
+
+        private const float spin_radius = 50;
+
+        private Beatmap beatmap;
+
+        public OsuAutoReplay(Beatmap beatmap)
+        {
+            this.beatmap = beatmap;
+
+            createAutoReplay();
+        }
+
+        internal class LegacyReplayFrameComparer : IComparer<LegacyReplayFrame>
+        {
+            public int Compare(LegacyReplayFrame f1, LegacyReplayFrame f2)
+            {
+                return f1.Time.CompareTo(f2.Time);
+            }
+        }
+
+        private static IComparer<LegacyReplayFrame> replayFrameComparer = new LegacyReplayFrameComparer();
+
+        private int findInsertionIndex(LegacyReplayFrame frame)
+        {
+            int index = Frames.BinarySearch(frame, replayFrameComparer);
+
+            if (index < 0)
+            {
+                index = ~index;
+            }
+            else
+            {
+                // Go to the first index which is actually bigger
+                while (index < Frames.Count && frame.Time == Frames[index].Time)
+                {
+                    ++index;
+                }
+            }
+
+            return index;
+        }
+
+        private void addFrameToReplay(LegacyReplayFrame frame) => Frames.Insert(findInsertionIndex(frame), frame);
+
+        private static Vector2 circlePosition(double t, double radius) => new Vector2((float)(Math.Cos(t) * radius), (float)(Math.Sin(t) * radius));
+
+        private double applyModsToTime(double v) => v;
+        private double applyModsToRate(double v) => v;
+
+        public bool DelayedMovements; // ModManager.CheckActive(Mods.Relax2);
+
+        private void createAutoReplay()
+        {
+            int buttonIndex = 0;
+
+            EasingTypes preferredEasing = DelayedMovements ? EasingTypes.InOutCubic : EasingTypes.Out;
+
+            addFrameToReplay(new LegacyReplayFrame(-100000, 256, 500, LegacyButtonState.None));
+            addFrameToReplay(new LegacyReplayFrame(beatmap.HitObjects[0].StartTime - 1500, 256, 500, LegacyButtonState.None));
+            addFrameToReplay(new LegacyReplayFrame(beatmap.HitObjects[0].StartTime - 1000, 256, 192, LegacyButtonState.None));
+
+            // We are using ApplyModsToRate and not ApplyModsToTime to counteract the speed up / slow down from HalfTime / DoubleTime so that we remain at a constant framerate of 60 fps.
+            float frameDelay = (float)applyModsToRate(1000.0 / 60.0);
+
+            // Already superhuman, but still somewhat realistic
+            int reactionTime = (int)applyModsToRate(100);
+
+
+            for (int i = 0; i < beatmap.HitObjects.Count; i++)
+            {
+                OsuHitObject h = (OsuHitObject)beatmap.HitObjects[i];
+
+                //if (h.EndTime < InputManager.ReplayStartTime)
+                //{
+                //    h.IsHit = true;
+                //    continue;
+                //}
+
+                int endDelay = h is Spinner ? 1 : 0;
+
+                if (DelayedMovements && i > 0)
+                {
+                    OsuHitObject last = (OsuHitObject)beatmap.HitObjects[i - 1];
+
+                    //Make the cursor stay at a hitObject as long as possible (mainly for autopilot).
+                    if (h.StartTime - h.HitWindowFor(OsuScoreResult.Miss) > last.EndTime + h.HitWindowFor(OsuScoreResult.Hit50) + 50)
+                    {
+                        if (!(last is Spinner) && h.StartTime - last.EndTime < 1000) addFrameToReplay(new LegacyReplayFrame(last.EndTime + h.HitWindowFor(OsuScoreResult.Hit50), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
+                        if (!(h is Spinner)) addFrameToReplay(new LegacyReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Miss), h.Position.X, h.Position.Y, LegacyButtonState.None));
+                    }
+                    else if (h.StartTime - h.HitWindowFor(OsuScoreResult.Hit50) > last.EndTime + h.HitWindowFor(OsuScoreResult.Hit50) + 50)
+                    {
+                        if (!(last is Spinner) && h.StartTime - last.EndTime < 1000) addFrameToReplay(new LegacyReplayFrame(last.EndTime + h.HitWindowFor(OsuScoreResult.Hit50), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
+                        if (!(h is Spinner)) addFrameToReplay(new LegacyReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Hit50), h.Position.X, h.Position.Y, LegacyButtonState.None));
+                    }
+                    else if (h.StartTime - h.HitWindowFor(OsuScoreResult.Hit100) > last.EndTime + h.HitWindowFor(OsuScoreResult.Hit100) + 50)
+                    {
+                        if (!(last is Spinner) && h.StartTime - last.EndTime < 1000) addFrameToReplay(new LegacyReplayFrame(last.EndTime + h.HitWindowFor(OsuScoreResult.Hit100), last.EndPosition.X, last.EndPosition.Y, LegacyButtonState.None));
+                        if (!(h is Spinner)) addFrameToReplay(new LegacyReplayFrame(h.StartTime - h.HitWindowFor(OsuScoreResult.Hit100), h.Position.X, h.Position.Y, LegacyButtonState.None));
+                    }
+                }
+
+
+                Vector2 targetPosition = h.Position;
+                EasingTypes easing = preferredEasing;
+                float spinnerDirection = -1;
+
+                if (h is Spinner)
+                {
+                    targetPosition.X = Frames[Frames.Count - 1].MouseX;
+                    targetPosition.Y = Frames[Frames.Count - 1].MouseY;
+
+                    Vector2 difference = spinner_centre - targetPosition;
+
+                    float differenceLength = difference.Length;
+                    float newLength = (float)Math.Sqrt(differenceLength * differenceLength - spin_radius * spin_radius);
+
+                    if (differenceLength > spin_radius)
+                    {
+                        float angle = (float)Math.Asin(spin_radius / differenceLength);
+
+                        if (angle > 0)
+                        {
+                            spinnerDirection = -1;
+                        }
+                        else
+                        {
+                            spinnerDirection = 1;
+                        }
+
+                        difference.X = difference.X * (float)Math.Cos(angle) - difference.Y * (float)Math.Sin(angle);
+                        difference.Y = difference.X * (float)Math.Sin(angle) + difference.Y * (float)Math.Cos(angle);
+
+                        difference.Normalize();
+                        difference *= newLength;
+
+                        targetPosition += difference;
+
+                        easing = EasingTypes.In;
+                    }
+                    else if (difference.Length > 0)
+                    {
+                        targetPosition = spinner_centre - difference * (spin_radius / difference.Length);
+                    }
+                    else
+                    {
+                        targetPosition = spinner_centre + new Vector2(0, -spin_radius);
+                    }
+                }
+
+
+                // Do some nice easing for cursor movements
+                if (Frames.Count > 0)
+                {
+                    LegacyReplayFrame lastFrame = Frames[Frames.Count - 1];
+
+                    // Wait until Auto could "see and react" to the next note.
+                    double waitTime = h.StartTime - Math.Max(0.0, DrawableOsuHitObject.TIME_PREEMPT - reactionTime);
+                    if (waitTime > lastFrame.Time)
+                    {
+                        lastFrame = new LegacyReplayFrame(waitTime, lastFrame.MouseX, lastFrame.MouseY, lastFrame.ButtonState);
+                        addFrameToReplay(lastFrame);
+                    }
+
+                    Vector2 lastPosition = new Vector2(lastFrame.MouseX, lastFrame.MouseY);
+
+                    double timeDifference = applyModsToTime(h.StartTime - lastFrame.Time);
+
+                    // Only "snap" to hitcircles if they are far enough apart. As the time between hitcircles gets shorter the snapping threshold goes up.
+                    if (timeDifference > 0 && // Sanity checks
+                        ((lastPosition - targetPosition).Length > h.Radius * (1.5 + 100.0 / timeDifference) || // Either the distance is big enough
+                        timeDifference >= 266)) // ... or the beats are slow enough to tap anyway.
+                    {
+                        // Perform eased movement
+                        for (double time = lastFrame.Time + frameDelay; time < h.StartTime; time += frameDelay)
+                        {
+                            Vector2 currentPosition = Interpolation.ValueAt(time, lastPosition, targetPosition, lastFrame.Time, h.StartTime, easing);
+                            addFrameToReplay(new LegacyReplayFrame((int)time, currentPosition.X, currentPosition.Y, lastFrame.ButtonState));
+                        }
+
+                        buttonIndex = 0;
+                    }
+                    else
+                    {
+                        buttonIndex++;
+                    }
+                }
+
+                LegacyButtonState button = buttonIndex % 2 == 0 ? LegacyButtonState.Left1 : LegacyButtonState.Right1;
+
+                LegacyReplayFrame newFrame = new LegacyReplayFrame(h.StartTime, targetPosition.X, targetPosition.Y, button);
+                LegacyReplayFrame endFrame = new LegacyReplayFrame(h.EndTime + endDelay, h.EndPosition.X, h.EndPosition.Y, LegacyButtonState.None);
+
+                // Decrement because we want the previous frame, not the next one
+                int index = findInsertionIndex(newFrame) - 1;
+
+                // Do we have a previous frame? No need to check for < replay.Count since we decremented!
+                if (index >= 0)
+                {
+                    LegacyReplayFrame previousFrame = Frames[index];
+                    var previousButton = previousFrame.ButtonState;
+
+                    // If a button is already held, then we simply alternate
+                    if (previousButton != LegacyButtonState.None)
+                    {
+                        Debug.Assert(previousButton != (LegacyButtonState.Left1 | LegacyButtonState.Right1));
+
+                        // Force alternation if we have the same button. Otherwise we can just keep the naturally to us assigned button.
+                        if (previousButton == button)
+                        {
+                            button = (LegacyButtonState.Left1 | LegacyButtonState.Right1) & ~button;
+                            newFrame.SetButtonStates(button);
+                        }
+
+                        // We always follow the most recent slider / spinner, so remove any other frames that occur while it exists.
+                        int endIndex = findInsertionIndex(endFrame);
+
+                        if (index < Frames.Count - 1)
+                            Frames.RemoveRange(index + 1, Math.Max(0, endIndex - (index + 1)));
+
+                        // After alternating we need to keep holding the other button in the future rather than the previous one.
+                        for (int j = index + 1; j < Frames.Count; ++j)
+                        {
+                            // Don't affect frames which stop pressing a button!
+                            if (j < Frames.Count - 1 || Frames[j].ButtonState == previousButton)
+                                Frames[j].SetButtonStates(button);
+                        }
+                    }
+                }
+
+                addFrameToReplay(newFrame);
+
+                // We add intermediate frames for spinning / following a slider here.
+                if (h is Spinner)
+                {
+                    Vector2 difference = targetPosition - spinner_centre;
+
+                    float radius = difference.Length;
+                    float angle = radius == 0 ? 0 : (float)Math.Atan2(difference.Y, difference.X);
+
+                    double t;
+
+                    for (double j = h.StartTime + frameDelay; j < h.EndTime; j += frameDelay)
+                    {
+                        t = applyModsToTime(j - h.StartTime) * spinnerDirection;
+
+                        Vector2 pos = spinner_centre + circlePosition(t / 20 + angle, spin_radius);
+                        addFrameToReplay(new LegacyReplayFrame((int)j, pos.X, pos.Y, button));
+                    }
+
+                    t = applyModsToTime(h.EndTime - h.StartTime) * spinnerDirection;
+                    Vector2 endPosition = spinner_centre + circlePosition(t / 20 + angle, spin_radius);
+
+                    addFrameToReplay(new LegacyReplayFrame(h.EndTime, endPosition.X, endPosition.Y, button));
+
+                    endFrame.MouseX = endPosition.X;
+                    endFrame.MouseY = endPosition.Y;
+                }
+                else if (h is Slider)
+                {
+                    Slider s = h as Slider;
+
+                    for (double j = frameDelay; j < s.Duration; j += frameDelay)
+                    {
+                        Vector2 pos = s.PositionAt(j / s.Duration);
+                        addFrameToReplay(new LegacyReplayFrame(h.StartTime + j, pos.X, pos.Y, button));
+                    }
+
+                    addFrameToReplay(new LegacyReplayFrame(h.EndTime, s.EndPosition.X, s.EndPosition.Y, button));
+                }
+
+                // We only want to let go of our button if we are at the end of the current replay. Otherwise something is still going on after us so we need to keep the button pressed!
+                if (Frames[Frames.Count - 1].Time <= endFrame.Time)
+                    addFrameToReplay(endFrame);
+            }
+
+            //Player.currentScore.Replay = InputManager.ReplayScore.Replay;
+            //Player.currentScore.PlayerName = "osu!";
+        }
+    }
+}
diff --git a/osu.Game.Modes.Osu/OsuDifficultyCalculator.cs b/osu.Game.Modes.Osu/OsuDifficultyCalculator.cs
index 9e2a311021..5ef0f0059d 100644
--- a/osu.Game.Modes.Osu/OsuDifficultyCalculator.cs
+++ b/osu.Game.Modes.Osu/OsuDifficultyCalculator.cs
@@ -2,10 +2,10 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
+using osu.Game.Modes.Osu.Beatmaps;
 using osu.Game.Modes.Osu.Objects;
 using System;
 using System.Collections.Generic;
-using osu.Game.Modes.Objects;
 
 namespace osu.Game.Modes.Osu
 {
@@ -14,8 +14,6 @@ namespace osu.Game.Modes.Osu
         private const double star_scaling_factor = 0.0675;
         private const double extreme_scaling_factor = 0.5;
 
-        protected override PlayMode PlayMode => PlayMode.Osu;
-
         /// <summary>
         /// HitObjects are stored as a member variable.
         /// </summary>
@@ -25,8 +23,6 @@ namespace osu.Game.Modes.Osu
         {
         }
 
-        protected override HitObjectConverter<OsuHitObject> Converter => new OsuHitObjectConverter();
-
         protected override void PreprocessHitObjects()
         {
             foreach (var h in Objects)
@@ -34,7 +30,7 @@ namespace osu.Game.Modes.Osu
                     ((Slider)h).Curve.Calculate();
         }
 
-        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        protected override double CalculateInternal(Dictionary<string, string> categoryDifficulty)
         {
             // Fill our custom DifficultyHitObject class, that carries additional information
             DifficultyHitObjects.Clear();
@@ -100,22 +96,23 @@ namespace osu.Game.Modes.Osu
         protected bool CalculateStrainValues()
         {
             // Traverse hitObjects in pairs to calculate the strain value of NextHitObject from the strain value of CurrentHitObject and environment.
-            List<OsuHitObjectDifficulty>.Enumerator hitObjectsEnumerator = DifficultyHitObjects.GetEnumerator();
-
-            if (!hitObjectsEnumerator.MoveNext()) return false;
-
-            OsuHitObjectDifficulty currentHitObject = hitObjectsEnumerator.Current;
-            OsuHitObjectDifficulty nextHitObject;
-
-            // First hitObject starts at strain 1. 1 is the default for strain values, so we don't need to set it here. See DifficultyHitObject.
-            while (hitObjectsEnumerator.MoveNext())
+            using (List<OsuHitObjectDifficulty>.Enumerator hitObjectsEnumerator = DifficultyHitObjects.GetEnumerator())
             {
-                nextHitObject = hitObjectsEnumerator.Current;
-                nextHitObject.CalculateStrains(currentHitObject, TimeRate);
-                currentHitObject = nextHitObject;
-            }
 
-            return true;
+                if (!hitObjectsEnumerator.MoveNext()) return false;
+
+                OsuHitObjectDifficulty current = hitObjectsEnumerator.Current;
+
+                // First hitObject starts at strain 1. 1 is the default for strain values, so we don't need to set it here. See DifficultyHitObject.
+                while (hitObjectsEnumerator.MoveNext())
+                {
+                    var next = hitObjectsEnumerator.Current;
+                    next?.CalculateStrains(current, TimeRate);
+                    current = next;
+                }
+
+                return true;
+            }
         }
 
         /// <summary>
@@ -183,8 +180,10 @@ namespace osu.Game.Modes.Osu
             return difficulty;
         }
 
+        protected override IBeatmapConverter<OsuHitObject> CreateBeatmapConverter() => new OsuBeatmapConverter();
+
         // Those values are used as array indices. Be careful when changing them!
-        public enum DifficultyType : int
+        public enum DifficultyType
         {
             Speed = 0,
             Aim,
diff --git a/osu.Game.Modes.Osu/OsuMod.cs b/osu.Game.Modes.Osu/OsuMod.cs
new file mode 100644
index 0000000000..3290eed61a
--- /dev/null
+++ b/osu.Game.Modes.Osu/OsuMod.cs
@@ -0,0 +1,100 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using osu.Game.Graphics;
+
+namespace osu.Game.Modes.Osu
+{
+    public class OsuModNoFail : ModNoFail
+    {
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
+    }
+
+    public class OsuModEasy : ModEasy
+    {
+
+    }
+
+    public class OsuModHidden : ModHidden
+    {
+        public override string Description => @"Play with no approach circles and fading notes for a slight score advantage.";
+        public override double ScoreMultiplier => 1.06;
+    }
+
+    public class OsuModHardRock : ModHardRock
+    {
+        public override double ScoreMultiplier => 1.06;
+        public override bool Ranked => true;
+    }
+
+    public class OsuModSuddenDeath : ModSuddenDeath
+    {
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
+    }
+
+    public class OsuModDoubleTime : ModDoubleTime
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+
+    public class OsuModRelax : ModRelax
+    {
+        public override string Description => "You don't need to click.\nGive your clicking/tapping finger a break from the heat of things.";
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
+    }
+
+    public class OsuModHalfTime : ModHalfTime
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+
+    public class OsuModNightcore : ModNightcore
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+
+    public class OsuModFlashlight : ModFlashlight
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+
+    public class OsuModPerfect : ModPerfect
+    {
+
+    }
+
+    public class OsuModSpunOut : Mod
+    {
+        public override string Name => "Spun Out";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_spunout;
+        public override string Description => @"Spinners will be automatically completed";
+        public override double ScoreMultiplier => 0.9;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(OsuModAutopilot) };
+    }
+
+    public class OsuModAutopilot : Mod
+    {
+        public override string Name => "Autopilot";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_autopilot;
+        public override string Description => @"Automatic cursor movement - just follow the rhythm.";
+        public override double ScoreMultiplier => 0;
+        public override bool Ranked => false;
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
+    }
+
+    public class OsuModAutoplay : ModAutoplay
+    {
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
+    }
+
+    public class OsuModTarget : Mod
+    {
+        public override string Name => "Target";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_target;
+        public override string Description => @"";
+        public override double ScoreMultiplier => 1;
+    }
+}
diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs
index d05c8193cc..0c46ece6da 100644
--- a/osu.Game.Modes.Osu/OsuRuleset.cs
+++ b/osu.Game.Modes.Osu/OsuRuleset.cs
@@ -1,22 +1,22 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using System.Linq;
+using OpenTK.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
+using osu.Game.Screens.Play;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Modes.Osu
 {
     public class OsuRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
-
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new OsuHitRenderer { Beatmap = beatmap };
+        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new OsuHitRenderer(beatmap);
 
         public override IEnumerable<BeatmapStatistic> GetBeatmapStatistics(WorkingBeatmap beatmap) => new[]
         {
@@ -34,14 +34,89 @@ namespace osu.Game.Modes.Osu
             }
         };
 
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.DifficultyReduction:
+                    return new Mod[]
+                    {
+                        new OsuModEasy(),
+                        new OsuModNoFail(),
+                        new OsuModHalfTime(),
+                    };
+
+                case ModType.DifficultyIncrease:
+                    return new Mod[]
+                    {
+                        new OsuModHardRock(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new OsuModSuddenDeath(),
+                                new OsuModPerfect(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new OsuModDoubleTime(),
+                                new OsuModNightcore(),
+                            },
+                        },
+                        new OsuModHidden(),
+                        new OsuModFlashlight(),
+                    };
+
+                case ModType.Special:
+                    return new Mod[]
+                    {
+                        new OsuModRelax(),
+                        new OsuModAutopilot(),
+                        new OsuModSpunOut(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new OsuModAutoplay(),
+                                new ModCinema(),
+                            },
+                        },
+                        new OsuModTarget(),
+                    };
+
+                default:
+                    return new Mod[] { };
+            }
+        }
+
         public override FontAwesome Icon => FontAwesome.fa_osu_osu_o;
 
         public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
 
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => new OsuScoreProcessor(hitObjectCount);
+        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => new OsuScoreProcessor(hitObjectCount);
 
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new OsuDifficultyCalculator(beatmap);
 
+        public override Score CreateAutoplayScore(Beatmap beatmap)
+        {
+            var score = CreateScoreProcessor().GetScore();
+            score.Replay = new OsuAutoReplay(beatmap);
+            return score;
+        }
+
         protected override PlayMode PlayMode => PlayMode.Osu;
+
+        public override string Description => "osu!";
+
+        public override IEnumerable<KeyCounter> CreateGameplayKeys() => new KeyCounter[]
+        {
+            new KeyCounterKeyboard(Key.Z),
+            new KeyCounterKeyboard(Key.X),
+            new KeyCounterMouse(MouseButton.Left),
+            new KeyCounterMouse(MouseButton.Right)
+        };
     }
 }
diff --git a/osu.Game.Modes.Osu/OsuScore.cs b/osu.Game.Modes.Osu/OsuScore.cs
index 6ea8eff890..dddf826887 100644
--- a/osu.Game.Modes.Osu/OsuScore.cs
+++ b/osu.Game.Modes.Osu/OsuScore.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Modes.Osu
 {
-    class OsuScore : Score
+    internal class OsuScore : Score
     {
     }
 }
diff --git a/osu.Game.Modes.Osu/OsuScoreProcessor.cs b/osu.Game.Modes.Osu/OsuScoreProcessor.cs
index 9493259558..7bc82c3c8b 100644
--- a/osu.Game.Modes.Osu/OsuScoreProcessor.cs
+++ b/osu.Game.Modes.Osu/OsuScoreProcessor.cs
@@ -6,12 +6,13 @@ using osu.Game.Modes.Osu.Objects.Drawables;
 
 namespace osu.Game.Modes.Osu
 {
-    class OsuScoreProcessor : ScoreProcessor
+    internal class OsuScoreProcessor : ScoreProcessor
     {
-        public OsuScoreProcessor(int hitObjectCount)
+        public OsuScoreProcessor(int hitObjectCount = 0)
             : base(hitObjectCount)
         {
             Health.Value = 1;
+            Accuracy.Value = 1;
         }
 
         protected override void UpdateCalculations(JudgementInfo judgement)
@@ -34,8 +35,9 @@ namespace osu.Game.Modes.Osu
             int score = 0;
             int maxScore = 0;
 
-            foreach (OsuJudgementInfo j in Judgements)
+            foreach (var judgementInfo in Judgements)
             {
+                var j = (OsuJudgementInfo)judgementInfo;
                 score += j.ScoreValue;
                 maxScore += j.MaxScoreValue;
             }
diff --git a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
index fa222aafd7..8b7606e61e 100644
--- a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
+++ b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
@@ -1,8 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Modes.Objects;
+using osu.Game.Beatmaps;
 using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Osu.Beatmaps;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.Objects.Drawables;
 using osu.Game.Modes.UI;
@@ -11,18 +12,28 @@ namespace osu.Game.Modes.Osu.UI
 {
     public class OsuHitRenderer : HitRenderer<OsuHitObject>
     {
-        protected override HitObjectConverter<OsuHitObject> Converter => new OsuHitObjectConverter();
-
-        protected override Playfield CreatePlayfield() => new OsuPlayfield();
-
-        protected override DrawableHitObject GetVisualRepresentation(OsuHitObject h)
+        public OsuHitRenderer(Beatmap beatmap)
+            : base(beatmap)
         {
-            if (h is HitCircle)
-                return new DrawableHitCircle(h as HitCircle);
-            if (h is Slider)
-                return new DrawableSlider(h as Slider);
-            if (h is Spinner)
-                return new DrawableSpinner(h as Spinner);
+        }
+
+        protected override IBeatmapConverter<OsuHitObject> CreateBeatmapConverter() => new OsuBeatmapConverter();
+
+        protected override Playfield<OsuHitObject> CreatePlayfield() => new OsuPlayfield();
+
+        protected override DrawableHitObject<OsuHitObject> GetVisualRepresentation(OsuHitObject h)
+        {
+            var circle = h as HitCircle;
+            if (circle != null)
+                return new DrawableHitCircle(circle);
+
+            var slider = h as Slider;
+            if (slider != null)
+                return new DrawableSlider(slider);
+
+            var spinner = h as Spinner;
+            if (spinner != null)
+                return new DrawableSpinner(spinner);
             return null;
         }
     }
diff --git a/osu.Game.Modes.Osu/UI/OsuPlayfield.cs b/osu.Game.Modes.Osu/UI/OsuPlayfield.cs
index 20164060fe..849d7e74d6 100644
--- a/osu.Game.Modes.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Modes.Osu/UI/OsuPlayfield.cs
@@ -10,10 +10,12 @@ using osu.Game.Modes.Osu.Objects.Drawables;
 using osu.Game.Modes.Osu.Objects.Drawables.Connections;
 using osu.Game.Modes.UI;
 using System.Linq;
+using osu.Game.Graphics.Cursor;
+using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Osu.UI
 {
-    public class OsuPlayfield : Playfield
+    public class OsuPlayfield : Playfield<OsuHitObject>
     {
         private Container approachCircles;
         private Container judgementLayer;
@@ -30,7 +32,7 @@ namespace osu.Game.Modes.Osu.UI
             }
         }
 
-        public OsuPlayfield()
+        public OsuPlayfield() : base(512)
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -53,11 +55,17 @@ namespace osu.Game.Modes.Osu.UI
                 {
                     RelativeSizeAxes = Axes.Both,
                     Depth = -1,
-                }
+                },
             });
         }
 
-        public override void Add(DrawableHitObject h)
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            AddInternal(new OsuCursorContainer { Colour = Color4.LightYellow });
+        }
+
+        public override void Add(DrawableHitObject<OsuHitObject> h)
         {
             h.Depth = (float)h.HitObject.StartTime;
             IDrawableHitObjectWithProxiedApproach c = h as IDrawableHitObjectWithProxiedApproach;
@@ -74,13 +82,13 @@ namespace osu.Game.Modes.Osu.UI
         public override void PostProcess()
         {
             connectionLayer.HitObjects = HitObjects.Children
-                .Select(d => (OsuHitObject)d.HitObject)
+                .Select(d => d.HitObject)
                 .OrderBy(h => h.StartTime);
         }
 
-        private void judgement(DrawableHitObject h, JudgementInfo j)
+        private void judgement(DrawableHitObject<OsuHitObject> h, JudgementInfo j)
         {
-            HitExplosion explosion = new HitExplosion((OsuJudgementInfo)j, (OsuHitObject)h.HitObject);
+            HitExplosion explosion = new HitExplosion((OsuJudgementInfo)j, h.HitObject);
 
             judgementLayer.Add(explosion);
         }
diff --git a/osu.Game.Modes.Osu/app.config b/osu.Game.Modes.Osu/app.config
index f77f36199c..88af66254d 100644
--- a/osu.Game.Modes.Osu/app.config
+++ b/osu.Game.Modes.Osu/app.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
index 1d3ee7a6a4..c214c881d8 100644
--- a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
+++ b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj
@@ -43,6 +43,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Beatmaps\OsuBeatmapConverter.cs" />
     <Compile Include="Objects\BezierApproximator.cs" />
     <Compile Include="Objects\CircularArcApproximator.cs" />
     <Compile Include="Objects\Drawables\DrawableOsuHitObject.cs" />
@@ -70,21 +71,20 @@
     <Compile Include="Objects\OsuHitObjectParser.cs" />
     <Compile Include="Objects\SliderCurve.cs" />
     <Compile Include="Objects\SliderTick.cs" />
+    <Compile Include="OsuAutoReplay.cs" />
     <Compile Include="OsuDifficultyCalculator.cs" />
     <Compile Include="OsuScore.cs" />
     <Compile Include="OsuScoreProcessor.cs" />
-    <Compile Include="UI\OsuComboCounter.cs" />
     <Compile Include="UI\OsuHitRenderer.cs" />
     <Compile Include="UI\OsuPlayfield.cs" />
     <Compile Include="OsuRuleset.cs" />
     <Compile Include="Objects\HitCircle.cs" />
     <Compile Include="Objects\Drawables\DrawableHitCircle.cs" />
     <Compile Include="Objects\OsuHitObject.cs" />
-    <Compile Include="Objects\OsuHitObjectConverter.cs" />
     <Compile Include="Objects\Slider.cs" />
     <Compile Include="Objects\Spinner.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\OsuScoreOverlay.cs" />
+    <Compile Include="OsuMod.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">
diff --git a/osu.Game.Modes.Osu/packages.config b/osu.Game.Modes.Osu/packages.config
index 4031dd62a8..08fca09c35 100644
--- a/osu.Game.Modes.Osu/packages.config
+++ b/osu.Game.Modes.Osu/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
new file mode 100644
index 0000000000..3230010fda
--- /dev/null
+++ b/osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -0,0 +1,20 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Taiko.Objects;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Taiko.Beatmaps
+{
+    internal class TaikoBeatmapConverter : IBeatmapConverter<TaikoBaseHit>
+    {
+        public Beatmap<TaikoBaseHit> Convert(Beatmap original)
+        {
+            return new Beatmap<TaikoBaseHit>(original)
+            {
+                HitObjects = new List<TaikoBaseHit>() // Todo: Implement
+            };
+        }
+    }
+}
diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
index 6666e2ad97..a6af85b6fe 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
@@ -10,7 +10,7 @@ using OpenTK;
 
 namespace osu.Game.Modes.Taiko.Objects.Drawable
 {
-    class DrawableTaikoHit : Sprite
+    internal class DrawableTaikoHit : Sprite
     {
         private TaikoBaseHit h;
 
diff --git a/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs b/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs
index 5eb69b62ce..3a0e07e390 100644
--- a/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs
+++ b/osu.Game.Modes.Taiko/Objects/TaikoConverter.cs
@@ -8,7 +8,7 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Modes.Taiko.Objects
 {
-    class TaikoConverter : HitObjectConverter<TaikoBaseHit>
+    internal class TaikoConverter : HitObjectConverter<TaikoBaseHit>
     {
         public override List<TaikoBaseHit> Convert(Beatmap beatmap)
         {
diff --git a/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs b/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs
index 5067cef2b3..4a133ea896 100644
--- a/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Modes.Taiko/TaikoDifficultyCalculator.cs
@@ -2,26 +2,23 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps;
-using osu.Game.Modes.Objects;
+using osu.Game.Modes.Taiko.Beatmaps;
 using osu.Game.Modes.Taiko.Objects;
-using System;
 using System.Collections.Generic;
 
 namespace osu.Game.Modes.Taiko
 {
     public class TaikoDifficultyCalculator : DifficultyCalculator<TaikoBaseHit>
     {
-        protected override PlayMode PlayMode => PlayMode.Taiko;
-
         public TaikoDifficultyCalculator(Beatmap beatmap) : base(beatmap)
         {
         }
 
-        protected override HitObjectConverter<TaikoBaseHit> Converter => new TaikoConverter();
-
-        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        protected override double CalculateInternal(Dictionary<string, string> categoryDifficulty)
         {
             return 0;
         }
+
+        protected override IBeatmapConverter<TaikoBaseHit> CreateBeatmapConverter() => new TaikoBeatmapConverter();
     }
 }
\ No newline at end of file
diff --git a/osu.Game.Modes.Taiko/TaikoMod.cs b/osu.Game.Modes.Taiko/TaikoMod.cs
new file mode 100644
index 0000000000..62db875991
--- /dev/null
+++ b/osu.Game.Modes.Taiko/TaikoMod.cs
@@ -0,0 +1,62 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Modes.Taiko
+{
+    public class TaikoModNoFail : ModNoFail
+    {
+
+    }
+
+    public class TaikoModEasy : ModEasy
+    {
+
+    }
+
+    public class TaikoModHidden : ModHidden
+    {
+        public override string Description => @"The notes fade out before you hit them!";
+        public override double ScoreMultiplier => 1.06;
+    }
+
+    public class TaikoModHardRock : ModHardRock
+    {
+        public override double ScoreMultiplier => 1.06;
+        public override bool Ranked => true;
+    }
+
+    public class TaikoModSuddenDeath : ModSuddenDeath
+    {
+
+    }
+
+    public class TaikoModDoubleTime : ModDoubleTime
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+
+    public class TaikoModRelax : ModRelax
+    {
+        public override string Description => @"Relax! You will no longer get dizzyfied by ninja-like spinners, demanding drumrolls or unexpected katu's.";
+    }
+
+    public class TaikoModHalfTime : ModHalfTime
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+
+    public class TaikoModNightcore : ModNightcore
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+
+    public class TaikoModFlashlight : ModFlashlight
+    {
+        public override double ScoreMultiplier => 1.12;
+    }
+
+    public class TaikoModPerfect : ModPerfect
+    {
+
+    }
+}
diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs
index 6141838880..418519d90c 100644
--- a/osu.Game.Modes.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs
@@ -1,26 +1,93 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using OpenTK.Input;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
 using osu.Game.Modes.UI;
-using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
+using System.Collections.Generic;
 
 namespace osu.Game.Modes.Taiko
 {
     public class TaikoRuleset : Ruleset
     {
-        public override ScoreOverlay CreateScoreOverlay() => new OsuScoreOverlay();
+        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer(beatmap);
 
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer { Beatmap = beatmap };
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.DifficultyReduction:
+                    return new Mod[]
+                    {
+                        new TaikoModEasy(),
+                        new TaikoModNoFail(),
+                        new TaikoModHalfTime(),
+                    };
+
+                case ModType.DifficultyIncrease:
+                    return new Mod[]
+                    {
+                        new TaikoModHardRock(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new TaikoModSuddenDeath(),
+                                new TaikoModPerfect(),
+                            },
+                        },
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new TaikoModDoubleTime(),
+                                new TaikoModNightcore(),
+                            },
+                        },
+                        new TaikoModHidden(),
+                        new TaikoModFlashlight(),
+                    };
+
+                case ModType.Special:
+                    return new Mod[]
+                    {
+                        new TaikoModRelax(),
+                        null,
+                        null,
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ModAutoplay(),
+                                new ModCinema(),
+                            },
+                        },
+                    };
+
+                default:
+                    return new Mod[] { };
+            }
+        }
 
         protected override PlayMode PlayMode => PlayMode.Taiko;
 
+        public override string Description => "osu!taiko";
+
         public override FontAwesome Icon => FontAwesome.fa_osu_taiko_o;
 
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null;
+        public override IEnumerable<KeyCounter> CreateGameplayKeys() => new KeyCounter[]
+        {
+            new KeyCounterKeyboard(Key.D),
+            new KeyCounterKeyboard(Key.F),
+            new KeyCounterKeyboard(Key.J),
+            new KeyCounterKeyboard(Key.K)
+        };
+
+        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
 
         public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
 
diff --git a/osu.Game.Modes.Taiko/UI/TaikoComboCounter.cs b/osu.Game.Modes.Taiko/UI/TaikoComboCounter.cs
deleted file mode 100644
index 44afa85989..0000000000
--- a/osu.Game.Modes.Taiko/UI/TaikoComboCounter.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Graphics.Transforms;
-using osu.Game.Modes.UI;
-using OpenTK;
-
-namespace osu.Game.Modes.Taiko.UI
-{
-    /// <summary>
-    /// Allows tint and scaling animations. Used in osu!taiko.
-    /// </summary>
-    public class TaikoComboCounter : ComboCounter
-    {
-        protected virtual int AnimationDuration => 300;
-        protected virtual float ScaleFactor => 2;
-        protected virtual EasingTypes AnimationEasing => EasingTypes.None;
-        protected virtual bool CanAnimateWhenBackwards => false;
-
-        public TaikoComboCounter()
-        {
-            DisplayedCountSpriteText.Origin = Framework.Graphics.Anchor.BottomCentre;
-            DisplayedCountSpriteText.Anchor = Framework.Graphics.Anchor.BottomCentre;
-        }
-
-        protected virtual void TransformAnimate(ulong newValue)
-        {
-            DisplayedCountSpriteText.Text = FormatCount(newValue);
-            DisplayedCountSpriteText.ScaleTo(new Vector2(1, ScaleFactor));
-            DisplayedCountSpriteText.ScaleTo(new Vector2(1, 1), AnimationDuration, AnimationEasing);
-        }
-
-        protected virtual void TransformNotAnimate(ulong newValue)
-        {
-            DisplayedCountSpriteText.Text = FormatCount(newValue);
-            DisplayedCountSpriteText.ScaleTo(1);
-        }
-
-        protected override void OnDisplayedCountRolling(ulong currentValue, ulong newValue)
-        {
-            if (newValue == 0)
-                DisplayedCountSpriteText.FadeOut(FadeOutDuration);
-            else
-                DisplayedCountSpriteText.Show();
-
-            TransformNotAnimate(newValue);
-        }
-
-        protected override void OnDisplayedCountChange(ulong newValue)
-        {
-            DisplayedCountSpriteText.FadeTo(newValue == 0 ? 0 : 1);
-
-            TransformNotAnimate(newValue);
-        }
-
-        protected override void OnDisplayedCountIncrement(ulong newValue)
-        {
-            DisplayedCountSpriteText.Show();
-
-            TransformAnimate(newValue);
-        }
-    }
-}
diff --git a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
index 0e2b6cdc83..dc0276aacc 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
@@ -1,8 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Modes.Objects;
+using osu.Game.Beatmaps;
 using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Taiko.Beatmaps;
 using osu.Game.Modes.Taiko.Objects;
 using osu.Game.Modes.UI;
 
@@ -10,10 +11,15 @@ namespace osu.Game.Modes.Taiko.UI
 {
     public class TaikoHitRenderer : HitRenderer<TaikoBaseHit>
     {
-        protected override HitObjectConverter<TaikoBaseHit> Converter => new TaikoConverter();
+        public TaikoHitRenderer(Beatmap beatmap)
+            : base(beatmap)
+        {
+        }
 
-        protected override Playfield CreatePlayfield() => new TaikoPlayfield();
+        protected override IBeatmapConverter<TaikoBaseHit> CreateBeatmapConverter() => new TaikoBeatmapConverter();
 
-        protected override DrawableHitObject GetVisualRepresentation(TaikoBaseHit h) => null;// new DrawableTaikoHit(h);
+        protected override Playfield<TaikoBaseHit> CreatePlayfield() => new TaikoPlayfield();
+
+        protected override DrawableHitObject<TaikoBaseHit> GetVisualRepresentation(TaikoBaseHit h) => null;// new DrawableTaikoHit(h);
     }
 }
diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
index e8aa28e5b3..2fcfce4fa3 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
@@ -5,13 +5,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Modes.Taiko.Objects;
 using osu.Game.Modes.UI;
 using OpenTK;
 using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Taiko.UI
 {
-    public class TaikoPlayfield : Playfield
+    public class TaikoPlayfield : Playfield<TaikoBaseHit>
     {
         public TaikoPlayfield()
         {
diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
index a964d48288..0089e84532 100644
--- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
+++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
@@ -47,15 +47,16 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Beatmaps\TaikoBeatmapConverter.cs" />
     <Compile Include="TaikoDifficultyCalculator.cs" />
     <Compile Include="Objects\Drawable\DrawableTaikoHit.cs" />
     <Compile Include="Objects\TaikoBaseHit.cs" />
     <Compile Include="Objects\TaikoConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\TaikoComboCounter.cs" />
     <Compile Include="UI\TaikoHitRenderer.cs" />
     <Compile Include="UI\TaikoPlayfield.cs" />
     <Compile Include="TaikoRuleset.cs" />
+    <Compile Include="TaikoMod.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\osu.licenseheader">
diff --git a/osu.Game.Modes.Taiko/packages.config b/osu.Game.Modes.Taiko/packages.config
index 4031dd62a8..08fca09c35 100644
--- a/osu.Game.Modes.Taiko/packages.config
+++ b/osu.Game.Modes.Taiko/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 84635af39a..ae936f3f49 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using System.IO;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -22,7 +23,7 @@ namespace osu.Game.Tests.Beatmaps.IO
     [TestFixture]
     public class ImportBeatmapTest
     {
-        const string osz_path = @"../../../osu-resources/osu.Game.Resources/Beatmaps/241526 Soleily - Renatus.osz";
+        private const string osz_path = @"../../../osu-resources/osu.Game.Resources/Beatmaps/241526 Soleily - Renatus.osz";
 
         [OneTimeSetUp]
         public void SetUp()
@@ -40,8 +41,16 @@ namespace osu.Game.Tests.Beatmaps.IO
             using (HeadlessGameHost host = new HeadlessGameHost())
             {
                 var osu = loadOsu(host);
-                osu.Dependencies.Get<BeatmapDatabase>().Import(osz_path);
+
+                var temp = prepareTempCopy(osz_path);
+
+                Assert.IsTrue(File.Exists(temp));
+
+                osu.Dependencies.Get<BeatmapDatabase>().Import(temp);
+
                 ensureLoaded(osu);
+
+                Assert.IsFalse(File.Exists(temp));
             }
         }
 
@@ -56,14 +65,51 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                 var osu = loadOsu(host);
 
-                var importer = new BeatmapImporter(client);
-                if (!importer.ImportAsync(osz_path).Wait(1000))
+                var temp = prepareTempCopy(osz_path);
+
+                Assert.IsTrue(File.Exists(temp));
+
+                var importer = new BeatmapIPCChannel(client);
+                if (!importer.ImportAsync(temp).Wait(1000))
                     Assert.Fail(@"IPC took too long to send");
 
                 ensureLoaded(osu);
+
+                Assert.IsFalse(File.Exists(temp));
             }
         }
 
+        [Test]
+        public void TestImportWhenFileOpen()
+        {
+            //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
+            using (HeadlessGameHost host = new HeadlessGameHost())
+            {
+                var osu = loadOsu(host);
+
+                var temp = prepareTempCopy(osz_path);
+
+                Assert.IsTrue(File.Exists(temp));
+
+                using (File.OpenRead(temp))
+                    osu.Dependencies.Get<BeatmapDatabase>().Import(temp);
+
+                ensureLoaded(osu);
+
+                Assert.IsTrue(File.Exists(temp));
+                
+                File.Delete(temp);
+
+                Assert.IsFalse(File.Exists(temp));
+            }
+        }
+
+        private string prepareTempCopy(string path)
+        {
+            var temp = Path.GetTempFileName();
+            return new FileInfo(path).CopyTo(temp, true).FullName;
+        }
+
         private OsuGameBase loadOsu(GameHost host)
         {
             var osu = new OsuGameBase();
@@ -84,13 +130,13 @@ namespace osu.Game.Tests.Beatmaps.IO
 
             Action waitAction = () =>
             {
-                while ((resultSets = osu.Dependencies.Get<BeatmapDatabase>()
-                    .Query<BeatmapSetInfo>().Where(s => s.OnlineBeatmapSetID == 241526)).Count() == 0)
+                while (!(resultSets = osu.Dependencies.Get<BeatmapDatabase>()
+                    .Query<BeatmapSetInfo>().Where(s => s.OnlineBeatmapSetID == 241526)).Any())
                     Thread.Sleep(50);
             };
 
             Assert.IsTrue(waitAction.BeginInvoke(null, null).AsyncWaitHandle.WaitOne(timeout),
-                $@"BeatmapSet did not import to the database in allocated time.");
+                @"BeatmapSet did not import to the database in allocated time.");
 
             //ensure we were stored to beatmap database backing...
 
@@ -122,7 +168,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
             var beatmap = osu.Dependencies.Get<BeatmapDatabase>().GetWorkingBeatmap(set.Beatmaps.First(b => b.Mode == PlayMode.Osu))?.Beatmap;
 
-            Assert.IsTrue(beatmap.HitObjects.Count > 0);
+            Assert.IsTrue(beatmap?.HitObjects.Count > 0);
         }
     }
 }
diff --git a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
index faa83518ba..2a69be92ca 100644
--- a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                 using (var stream = new StreamReader(
                     reader.GetStream("Soleily - Renatus (Deif) [Platter].osu")))
                 {
-                    Assert.AreEqual("osu file format v13", stream.ReadLine().Trim());
+                    Assert.AreEqual("osu file format v13", stream.ReadLine()?.Trim());
                 }
             }
         }
diff --git a/osu.Game.Tests/app.config b/osu.Game.Tests/app.config
index b9af3fdc80..855da39b10 100644
--- a/osu.Game.Tests/app.config
+++ b/osu.Game.Tests/app.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 009cafe59e..96682dd1ce 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -38,10 +38,6 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="nunit.framework">
-      <HintPath>$(SolutionDir)\packages\NUnit.3.5.0\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
     <Reference Include="SQLite.Net">
       <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
     </Reference>
diff --git a/osu.Game.Tests/packages.config b/osu.Game.Tests/packages.config
index c3be99dfd1..ca53ef08b0 100644
--- a/osu.Game.Tests/packages.config
+++ b/osu.Game.Tests/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index f195f8f2ba..de869192b9 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -1,23 +1,44 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using System.Linq;
 using OpenTK.Graphics;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Database;
-using osu.Game.Modes.Objects;
 using osu.Game.Modes;
+using osu.Game.Modes.Objects;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Beatmaps
 {
-    public class Beatmap
+    /// <summary>
+    /// A Beatmap containing converted HitObjects.
+    /// </summary>
+    public class Beatmap<T>
+        where T : HitObject
     {
-        public BeatmapInfo BeatmapInfo { get; set; }
+        public BeatmapInfo BeatmapInfo;
+        public List<ControlPoint> ControlPoints;
+        public List<Color4> ComboColors;
+
         public BeatmapMetadata Metadata => BeatmapInfo?.Metadata ?? BeatmapInfo?.BeatmapSet?.Metadata;
-        public List<HitObject> HitObjects { get; set; }
-        public List<ControlPoint> ControlPoints { get; set; }
-        public List<Color4> ComboColors { get; set; }
+
+        /// <summary>
+        /// The HitObjects this Beatmap contains.
+        /// </summary>
+        public List<T> HitObjects;
+
+        /// <summary>
+        /// Constructs a new beatmap.
+        /// </summary>
+        /// <param name="original">The original beatmap to use the parameters of.</param>
+        public Beatmap(Beatmap original = null)
+        {
+            BeatmapInfo = original?.BeatmapInfo;
+            ControlPoints = original?.ControlPoints;
+            ComboColors = original?.ComboColors;
+        }
+
         public double BPMMaximum => 60000 / (ControlPoints?.Where(c => c.BeatLength != 0).OrderBy(c => c.BeatLength).FirstOrDefault() ?? ControlPoint.Default).BeatLength;
         public double BPMMinimum => 60000 / (ControlPoints?.Where(c => c.BeatLength != 0).OrderByDescending(c => c.BeatLength).FirstOrDefault() ?? ControlPoint.Default).BeatLength;
         public double BPMMode => BPMAt(ControlPoints.Where(c => c.BeatLength != 0).GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).First().First().Time);
@@ -58,7 +79,17 @@ namespace osu.Game.Beatmaps
 
             return timingPoint ?? ControlPoint.Default;
         }
+    }
 
+    /// <summary>
+    /// A Beatmap containing un-converted HitObjects.
+    /// </summary>
+    public class Beatmap : Beatmap<HitObject>
+    {
+        /// <summary>
+        /// Calculates the star difficulty for this Beatmap.
+        /// </summary>
+        /// <returns>The star difficulty.</returns>
         public double CalculateStarDifficulty() => Ruleset.GetRuleset(BeatmapInfo.Mode).CreateDifficultyCalculator(this).Calculate();
     }
 }
diff --git a/osu.Game/Beatmaps/DifficultyCalculator.cs b/osu.Game/Beatmaps/DifficultyCalculator.cs
index 8214496363..9c057d5f77 100644
--- a/osu.Game/Beatmaps/DifficultyCalculator.cs
+++ b/osu.Game/Beatmaps/DifficultyCalculator.cs
@@ -1,20 +1,16 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Modes;
 using osu.Game.Modes.Objects;
-using System;
 using System.Collections.Generic;
 
 namespace osu.Game.Beatmaps
 {
     public abstract class DifficultyCalculator
     {
-        protected abstract PlayMode PlayMode { get; }
-
         protected double TimeRate = 1;
 
-        protected abstract double CalculateInternal(Dictionary<String, String> categoryDifficulty);
+        protected abstract double CalculateInternal(Dictionary<string, string> categoryDifficulty);
 
         private void loadTiming()
         {
@@ -35,16 +31,16 @@ namespace osu.Game.Beatmaps
     {
         protected List<T> Objects;
 
-        protected abstract HitObjectConverter<T> Converter { get; }
-
-        public DifficultyCalculator(Beatmap beatmap)
+        protected DifficultyCalculator(Beatmap beatmap)
         {
-            Objects = Converter.Convert(beatmap);
+            Objects = CreateBeatmapConverter().Convert(beatmap).HitObjects;
             PreprocessHitObjects();
         }
 
         protected virtual void PreprocessHitObjects()
         {
         }
+
+        protected abstract IBeatmapConverter<T> CreateBeatmapConverter();
     }
 }
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
index 5af2e7c197..9b897b4912 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Beatmaps.Drawables
 {
-    class BeatmapBackgroundSprite : Sprite
+    internal class BeatmapBackgroundSprite : Sprite
     {
         private readonly WorkingBeatmap working;
 
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs b/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
index 9c1f1a02fc..2cccbc322a 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
@@ -10,7 +10,7 @@ using osu.Game.Database;
 
 namespace osu.Game.Beatmaps.Drawables
 {
-    class BeatmapGroup : IStateful<BeatmapGroupState>
+    internal class BeatmapGroup : IStateful<BeatmapGroupState>
     {
         public BeatmapPanel SelectedPanel;
 
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
index 1db339a5b6..aa5891c37e 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
@@ -18,7 +18,7 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Beatmaps.Drawables
 {
-    class BeatmapPanel : Panel
+    internal class BeatmapPanel : Panel
     {
         public BeatmapInfo Beatmap;
         private Sprite background;
@@ -86,7 +86,7 @@ namespace osu.Game.Beatmaps.Drawables
                 new FillFlowContainer
                 {
                     Padding = new MarginPadding(5),
-                    Direction = FillDirection.Right,
+                    Direction = FillDirection.Horizontal,
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
@@ -95,19 +95,17 @@ namespace osu.Game.Beatmaps.Drawables
                         new DifficultyIcon(beatmap)
                         {
                             Scale = new Vector2(1.8f),
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
                         },
                         new FillFlowContainer
                         {
                             Padding = new MarginPadding { Left = 5 },
-                            Direction = FillDirection.Down,
+                            Direction = FillDirection.Vertical,
                             AutoSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
                                 new FillFlowContainer
                                 {
-                                    Direction = FillDirection.Right,
+                                    Direction = FillDirection.Horizontal,
                                     Spacing = new Vector2(4, 0),
                                     AutoSizeAxes = Axes.Both,
                                     Children = new[]
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
index 36cbebf8de..c1ac93f70c 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
@@ -17,7 +17,7 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables
 {
-    class BeatmapSetHeader : Panel
+    internal class BeatmapSetHeader : Panel
     {
         public Action<BeatmapSetHeader> GainedSelection;
         private SpriteText title, artist;
@@ -38,7 +38,7 @@ namespace osu.Game.Beatmaps.Drawables
                 },
                 new FillFlowContainer
                 {
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
                     AutoSizeAxes = Axes.Both,
                     Children = new[]
@@ -52,7 +52,6 @@ namespace osu.Game.Beatmaps.Drawables
                         },
                         artist = new OsuSpriteText
                         {
-                            Margin = new MarginPadding { Top = -1 },
                             Font = @"Exo2.0-SemiBoldItalic",
                             Text = beatmap.BeatmapSetInfo.Metadata.Artist,
                             TextSize = 17,
@@ -97,7 +96,7 @@ namespace osu.Game.Beatmaps.Drawables
             base.Dispose(isDisposing);
         }
 
-        class PanelBackground : BufferedContainer
+        private class PanelBackground : BufferedContainer
         {
             private readonly WorkingBeatmap working;
 
@@ -112,7 +111,7 @@ namespace osu.Game.Beatmaps.Drawables
                     new FillFlowContainer
                     {
                         Depth = -1,
-                        Direction = FillDirection.Right,
+                        Direction = FillDirection.Horizontal,
                         RelativeSizeAxes = Axes.Both,
                         // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
                         Shear = new Vector2(0.8f, 0),
@@ -161,7 +160,7 @@ namespace osu.Game.Beatmaps.Drawables
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     FillMode = FillMode.Fill,
-                }.LoadAsync(game, (bg) =>
+                }.LoadAsync(game, bg =>
                 {
                     Add(bg);
                     ForceRedraw();
diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index e0e390fcb1..47ae4d7985 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -12,7 +12,7 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables
 {
-    class DifficultyIcon : Container
+    internal class DifficultyIcon : Container
     {
         private readonly BeatmapInfo beatmap;
         private OsuColour palette;
@@ -34,6 +34,7 @@ namespace osu.Game.Beatmaps.Drawables
                 new TextAwesome
                 {
                     Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     TextSize = Size.X,
                     Colour = getColour(beatmap),
                     Icon = FontAwesome.fa_circle
@@ -41,6 +42,7 @@ namespace osu.Game.Beatmaps.Drawables
                 new TextAwesome
                 {
                     Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     TextSize = Size.X,
                     Colour = Color4.White,
                     Icon = Ruleset.GetRuleset(beatmap.Mode).Icon
@@ -48,7 +50,7 @@ namespace osu.Game.Beatmaps.Drawables
             };
         }
 
-        enum DifficultyRating
+        private enum DifficultyRating
         {
             Easy,
             Normal,
diff --git a/osu.Game/Beatmaps/Drawables/Panel.cs b/osu.Game/Beatmaps/Drawables/Panel.cs
index 891e86164c..a15d0c22f0 100644
--- a/osu.Game/Beatmaps/Drawables/Panel.cs
+++ b/osu.Game/Beatmaps/Drawables/Panel.cs
@@ -8,20 +8,16 @@ using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Game.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Beatmaps.Drawables
 {
-    class Panel : Container, IStateful<PanelSelectedState>
+    internal class Panel : Container, IStateful<PanelSelectedState>
     {
         public const float MAX_HEIGHT = 80;
 
         public override bool RemoveWhenNotAlive => false;
 
-        public bool IsOnScreen;
-
-        public override bool IsAlive => IsOnScreen && base.IsAlive;
-
         private Container nestedContainer;
 
         protected override Container<Drawable> Content => nestedContainer;
@@ -119,7 +115,7 @@ namespace osu.Game.Beatmaps.Drawables
         }
     }
 
-    enum PanelSelectedState
+    internal enum PanelSelectedState
     {
         Hidden,
         NotSelected,
diff --git a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs
index 7f55b3be1b..d13cb33554 100644
--- a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs
@@ -17,8 +17,9 @@ namespace osu.Game.Beatmaps.Formats
 
         public static BeatmapDecoder GetDecoder(TextReader stream)
         {
-            var line = stream.ReadLine().Trim();
-            if (!decoders.ContainsKey(line))
+            var line = stream.ReadLine()?.Trim();
+
+            if (line == null || !decoders.ContainsKey(line))
                 throw new IOException(@"Unknown file format");
             return (BeatmapDecoder)Activator.CreateInstance(decoders[line]);
         }
diff --git a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
index aa2e2fbc75..9ce5a4cca0 100644
--- a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Beatmaps.Formats
 
             if (split.Length > 2)
             {
-                int kiaiFlags = split.Length > 7 ? Convert.ToInt32(split[7], NumberFormatInfo.InvariantInfo) : 0;
+                //int kiaiFlags = split.Length > 7 ? Convert.ToInt32(split[7], NumberFormatInfo.InvariantInfo) : 0;
                 double beatLength = double.Parse(split[1].Trim(), NumberFormatInfo.InvariantInfo);
                 cp = new ControlPoint
                 {
@@ -219,15 +219,18 @@ namespace osu.Game.Beatmaps.Formats
                 throw new InvalidOperationException($@"Color specified in incorrect format (should be R,G,B): {val}");
             byte r, g, b;
             if (!byte.TryParse(split[0], out r) || !byte.TryParse(split[1], out g) || !byte.TryParse(split[2], out b))
-                throw new InvalidOperationException($@"Color must be specified with 8-bit integer components");
+                throw new InvalidOperationException(@"Color must be specified with 8-bit integer components");
             // Note: the combo index specified in the beatmap is discarded
-            beatmap.ComboColors.Add(new Color4
+            if (key.StartsWith(@"Combo"))
             {
-                R = r / 255f,
-                G = g / 255f,
-                B = b / 255f,
-                A = 1f,
-            });
+                beatmap.ComboColors.Add(new Color4
+                {
+                    R = r / 255f,
+                    G = g / 255f,
+                    B = b / 255f,
+                    A = 1f,
+                });
+            }
         }
 
         protected override void ParseFile(TextReader stream, Beatmap beatmap)
@@ -235,10 +238,9 @@ namespace osu.Game.Beatmaps.Formats
             HitObjectParser parser = null;
 
             var section = Section.None;
-            string line;
             while (true)
             {
-                line = stream.ReadLine();
+                var line = stream.ReadLine();
                 if (line == null)
                     break;
                 if (string.IsNullOrEmpty(line))
diff --git a/osu.Game/Beatmaps/IBeatmapCoverter.cs b/osu.Game/Beatmaps/IBeatmapCoverter.cs
new file mode 100644
index 0000000000..da5892c168
--- /dev/null
+++ b/osu.Game/Beatmaps/IBeatmapCoverter.cs
@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes.Objects;
+
+namespace osu.Game.Beatmaps
+{
+    public interface IBeatmapConverter<T> where T : HitObject
+    {
+        Beatmap<T> Convert(Beatmap original);
+    }
+}
diff --git a/osu.Game/Beatmaps/Timing/ControlPoint.cs b/osu.Game/Beatmaps/Timing/ControlPoint.cs
index 88e2c2d0f4..bd53928a32 100644
--- a/osu.Game/Beatmaps/Timing/ControlPoint.cs
+++ b/osu.Game/Beatmaps/Timing/ControlPoint.cs
@@ -15,7 +15,8 @@ namespace osu.Game.Beatmaps.Timing
         public double BeatLength;
         public double VelocityAdjustment;
         public bool TimingChange;
-        
+        public bool KiaiMode;
+
     }
 
     internal enum TimeSignatures
diff --git a/osu.Game/Beatmaps/Timing/TimingChange.cs b/osu.Game/Beatmaps/Timing/TimingChange.cs
index 74e855e157..b759fcd01c 100644
--- a/osu.Game/Beatmaps/Timing/TimingChange.cs
+++ b/osu.Game/Beatmaps/Timing/TimingChange.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Beatmaps.Timing
 {
-    class TimingChange : ControlPoint
+    internal class TimingChange : ControlPoint
     {
         public TimingChange(double beatLength)
         {
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 9393c2b0e9..1d4047ea45 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -2,12 +2,15 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using osu.Framework.Audio.Track;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
+using osu.Game.Modes;
 
 namespace osu.Game.Beatmaps
 {
@@ -17,6 +20,16 @@ namespace osu.Game.Beatmaps
 
         public readonly BeatmapSetInfo BeatmapSetInfo;
 
+        /// <summary>
+        /// A play mode that is preferred for this beatmap. PlayMode will become this mode where conversion is feasible,
+        /// or otherwise to the beatmap's default.
+        /// </summary>
+        public PlayMode? PreferredPlayMode;
+
+        public PlayMode PlayMode => beatmap?.BeatmapInfo?.Mode > PlayMode.Osu ? beatmap.BeatmapInfo.Mode : PreferredPlayMode ?? PlayMode.Osu;
+
+        public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>();
+
         public readonly bool WithStoryboard;
 
         protected abstract ArchiveReader GetReader();
diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index fc2c7558b0..871251b882 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Security.Cryptography;
+using osu.Framework.Extensions;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
@@ -20,19 +20,20 @@ namespace osu.Game.Database
 {
     public class BeatmapDatabase
     {
-        private SQLiteConnection connection { get; set; }
+        private SQLiteConnection connection { get; }
         private Storage storage;
         public event Action<BeatmapSetInfo> BeatmapSetAdded;
         public event Action<BeatmapSetInfo> BeatmapSetRemoved;
 
-        private BeatmapImporter ipc;
+        // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
+        private BeatmapIPCChannel ipc;
 
-        public BeatmapDatabase(Storage storage, GameHost importHost = null)
+        public BeatmapDatabase(Storage storage, IIpcHost importHost = null)
         {
             this.storage = storage;
 
             if (importHost != null)
-                ipc = new BeatmapImporter(importHost, this);
+                ipc = new BeatmapIPCChannel(importHost, this);
 
             if (connection == null)
             {
@@ -73,7 +74,7 @@ namespace osu.Game.Database
                 }
                 catch (Exception e)
                 {
-                    Logger.Error(e, $@"Could not delete beatmap {b.ToString()}");
+                    Logger.Error(e, $@"Could not delete beatmap {b}");
                 }
             }
 
@@ -116,13 +117,61 @@ namespace osu.Game.Database
             connection.DeleteAll<BeatmapInfo>();
         }
 
+        /// <summary>
+        /// Import multiple <see cref="BeatmapSetInfo"/> from <paramref name="paths"/>.
+        /// </summary>
+        /// <param name="paths">Multiple locations on disk</param>
         public void Import(IEnumerable<string> paths)
         {
+            Stack<BeatmapSetInfo> sets = new Stack<BeatmapSetInfo>();
+
             foreach (string p in paths)
-                Import(p);
+                try
+                {
+                    BeatmapSetInfo set = getBeatmapSet(p);
+
+                    //If we have an ID then we already exist in the database.
+                    if (set.ID == 0)
+                        sets.Push(set);
+
+                    // We may or may not want to delete the file depending on where it is stored.
+                    //  e.g. reconstructing/repairing database with beatmaps from default storage.
+                    // Also, not always a single file, i.e. for LegacyFilesystemReader
+                    // TODO: Add a check to prevent files from storage to be deleted.
+                    try
+                    {
+                        File.Delete(p);
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error(e, $@"Could not delete file at {p}");
+                    }
+                }
+                catch (Exception e)
+                {
+                    e = e.InnerException ?? e;
+                    Logger.Error(e, @"Could not import beatmap set");
+                }
+
+            // Batch commit with multiple sets to database
+            Import(sets);
         }
 
+        /// <summary>
+        /// Import <see cref="BeatmapSetInfo"/> from <paramref name="path"/>.
+        /// </summary>
+        /// <param name="path">Location on disk</param>
         public void Import(string path)
+        {
+            Import(new[] { path });
+        }
+
+        /// <summary>
+        /// Duplicates content from <paramref name="path"/> to storage and returns a representing <see cref="BeatmapSetInfo"/>.
+        /// </summary>
+        /// <param name="path">Content location</param>
+        /// <returns><see cref="BeatmapSetInfo"/></returns>
+        private BeatmapSetInfo getBeatmapSet(string path)
         {
             string hash = null;
 
@@ -133,10 +182,9 @@ namespace osu.Game.Database
 
             if (File.Exists(path)) // Not always the case, i.e. for LegacyFilesystemReader
             {
-                using (var md5 = MD5.Create())
                 using (var input = storage.GetStream(path))
                 {
-                    hash = BitConverter.ToString(md5.ComputeHash(input)).Replace("-", "").ToLowerInvariant();
+                    hash = input.GetMd5Hash();
                     input.Seek(0, SeekOrigin.Begin);
                     path = Path.Combine(@"beatmaps", hash.Remove(1), hash.Remove(2), hash);
                     if (!storage.Exists(path))
@@ -156,7 +204,7 @@ namespace osu.Game.Database
                     BeatmapSetAdded?.Invoke(existing);
                 }
 
-                return;
+                return existing;
             }
 
             var beatmapSet = new BeatmapSetInfo
@@ -168,27 +216,32 @@ namespace osu.Game.Database
                 Metadata = metadata
             };
 
-            using (var reader = ArchiveReader.GetReader(storage, path))
+            using (var archive = ArchiveReader.GetReader(storage, path))
             {
-                string[] mapNames = reader.BeatmapFilenames;
+                string[] mapNames = archive.BeatmapFilenames;
                 foreach (var name in mapNames)
-                {
-                    using (var stream = new StreamReader(reader.GetStream(name)))
+                    using (var raw = archive.GetStream(name))
+                    using (var ms = new MemoryStream()) //we need a memory stream so we can seek and shit
+                    using (var sr = new StreamReader(ms))
                     {
-                        var decoder = BeatmapDecoder.GetDecoder(stream);
-                        Beatmap beatmap = decoder.Decode(stream);
+                        raw.CopyTo(ms);
+                        ms.Position = 0;
+
+                        var decoder = BeatmapDecoder.GetDecoder(sr);
+                        Beatmap beatmap = decoder.Decode(sr);
+
                         beatmap.BeatmapInfo.Path = name;
+                        beatmap.BeatmapInfo.Hash = ms.GetMd5Hash();
 
                         // TODO: Diff beatmap metadata with set metadata and leave it here if necessary
                         beatmap.BeatmapInfo.Metadata = null;
 
                         beatmapSet.Beatmaps.Add(beatmap.BeatmapInfo);
                     }
-                    beatmapSet.StoryboardFile = reader.StoryboardFilename;
-                }
+                beatmapSet.StoryboardFile = archive.StoryboardFilename;
             }
 
-            Import(new[] { beatmapSet });
+            return beatmapSet;
         }
 
         public void Import(IEnumerable<BeatmapSetInfo> beatmapSets)
@@ -272,8 +325,7 @@ namespace osu.Game.Database
             return item;
         }
 
-        readonly Type[] validTypes = new[]
-        {
+        private readonly Type[] validTypes = {
             typeof(BeatmapSetInfo),
             typeof(BeatmapInfo),
             typeof(BeatmapMetadata),
@@ -283,7 +335,7 @@ namespace osu.Game.Database
         public void Update<T>(T record, bool cascade = true) where T : class
         {
             if (validTypes.All(t => t != typeof(T)))
-                throw new ArgumentException(nameof(T), "Must be a type managed by BeatmapDatabase");
+                throw new ArgumentException("Must be a type managed by BeatmapDatabase", nameof(T));
             if (cascade)
                 connection.UpdateWithChildren(record);
             else
diff --git a/osu.Game/Database/BeatmapInfo.cs b/osu.Game/Database/BeatmapInfo.cs
index 1c2ae2bf78..017f34726b 100644
--- a/osu.Game/Database/BeatmapInfo.cs
+++ b/osu.Game/Database/BeatmapInfo.cs
@@ -1,12 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Linq;
 using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes;
 using SQLite.Net.Attributes;
 using SQLiteNetExtensions.Attributes;
+using System;
+using System.Linq;
 
 namespace osu.Game.Database
 {
@@ -15,9 +15,9 @@ namespace osu.Game.Database
         [PrimaryKey, AutoIncrement]
         public int ID { get; set; }
 
-        public int? OnlineBeatmapID { get; set; } = null;
+        public int? OnlineBeatmapID { get; set; }
 
-        public int? OnlineBeatmapSetID { get; set; } = null;
+        public int? OnlineBeatmapSetID { get; set; }
 
         [ForeignKey(typeof(BeatmapSetInfo))]
         public int BeatmapSetInfoID { get; set; }
@@ -39,6 +39,8 @@ namespace osu.Game.Database
 
         public string Path { get; set; }
 
+        public string Hash { get; set; }
+
         // General
         public int AudioLeadIn { get; set; }
         public bool Countdown { get; set; }
@@ -57,13 +59,14 @@ namespace osu.Game.Database
         {
             get
             {
-                return StoredBookmarks.Split(',').Select(b => int.Parse(b)).ToArray();
+                return StoredBookmarks.Split(',').Select(int.Parse).ToArray();
             }
             set
             {
                 StoredBookmarks = string.Join(",", value);
             }
         }
+
         public double DistanceSpacing { get; set; }
         public int BeatDivisor { get; set; }
         public int GridSize { get; set; }
@@ -77,9 +80,9 @@ namespace osu.Game.Database
         {
             get
             {
-                return (starDifficulty < 0) ? (BaseDifficulty?.OverallDifficulty ?? 5) : starDifficulty;
+                return starDifficulty < 0 ? (BaseDifficulty?.OverallDifficulty ?? 5) : starDifficulty;
             }
-            
+
             set { starDifficulty = value; }
         }
 
diff --git a/osu.Game/Database/BeatmapMetadata.cs b/osu.Game/Database/BeatmapMetadata.cs
index 908fe3fd2b..d7dbb02cf9 100644
--- a/osu.Game/Database/BeatmapMetadata.cs
+++ b/osu.Game/Database/BeatmapMetadata.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Database
         [PrimaryKey, AutoIncrement]
         public int ID { get; set; }
 
-        public int? OnlineBeatmapSetID { get; set; } = null;
+        public int? OnlineBeatmapSetID { get; set; }
 
         public string Title { get; set; }
         public string TitleUnicode { get; set; }
diff --git a/osu.Game/Database/BeatmapSetInfo.cs b/osu.Game/Database/BeatmapSetInfo.cs
index 07076d881e..3e05451bed 100644
--- a/osu.Game/Database/BeatmapSetInfo.cs
+++ b/osu.Game/Database/BeatmapSetInfo.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Database
         [PrimaryKey, AutoIncrement]
         public int ID { get; set; }
 
-        public int? OnlineBeatmapSetID { get; set; } = null;
+        public int? OnlineBeatmapSetID { get; set; }
 
         [OneToOne(CascadeOperations = CascadeOperation.All)]
         public BeatmapMetadata Metadata { get; set; }
diff --git a/osu.Game/Database/ScoreDatabase.cs b/osu.Game/Database/ScoreDatabase.cs
new file mode 100644
index 0000000000..b437b354d3
--- /dev/null
+++ b/osu.Game/Database/ScoreDatabase.cs
@@ -0,0 +1,112 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.IO;
+using System.Linq;
+using osu.Framework.Platform;
+using osu.Game.IO.Legacy;
+using osu.Game.IPC;
+using osu.Game.Modes;
+using SharpCompress.Compressors.LZMA;
+
+namespace osu.Game.Database
+{
+    public class ScoreDatabase
+    {
+        private readonly Storage storage;
+        private readonly BeatmapDatabase beatmaps;
+
+        private const string replay_folder = @"replays";
+
+        // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
+        private ScoreIPCChannel ipc;
+
+        public ScoreDatabase(Storage storage, IIpcHost importHost = null, BeatmapDatabase beatmaps = null)
+        {
+            this.storage = storage;
+            this.beatmaps = beatmaps;
+
+            if (importHost != null)
+                ipc = new ScoreIPCChannel(importHost, this);
+        }
+
+        public Score ReadReplayFile(string replayFilename)
+        {
+            Score score;
+
+            using (Stream s = storage.GetStream(Path.Combine(replay_folder, replayFilename)))
+            using (SerializationReader sr = new SerializationReader(s))
+            {
+                var ruleset = Ruleset.GetRuleset((PlayMode)sr.ReadByte());
+                var processor = ruleset.CreateScoreProcessor();
+
+                score = processor.GetScore();
+
+                /* score.Pass = true;*/
+                var version = sr.ReadInt32();
+                /* score.FileChecksum = */
+                var beatmapHash = sr.ReadString();
+                score.Beatmap = beatmaps.Query<BeatmapInfo>().FirstOrDefault(b => b.Hash == beatmapHash);
+                /* score.PlayerName = */
+                sr.ReadString();
+                /* var localScoreChecksum = */
+                sr.ReadString();
+                /* score.Count300 = */
+                sr.ReadUInt16();
+                /* score.Count100 = */
+                sr.ReadUInt16();
+                /* score.Count50 = */
+                sr.ReadUInt16();
+                /* score.CountGeki = */
+                sr.ReadUInt16();
+                /* score.CountKatu = */
+                sr.ReadUInt16();
+                /* score.CountMiss = */
+                sr.ReadUInt16();
+                score.TotalScore = sr.ReadInt32();
+                score.MaxCombo = sr.ReadUInt16();
+                /* score.Perfect = */
+                sr.ReadBoolean();
+                /* score.EnabledMods = (Mods)*/
+                sr.ReadInt32();
+                /* score.HpGraphString = */
+                sr.ReadString();
+                /* score.Date = */
+                sr.ReadDateTime();
+
+                var compressedReplay = sr.ReadByteArray();
+
+                if (version >= 20140721)
+                    /*OnlineId =*/
+                    sr.ReadInt64();
+                else if (version >= 20121008)
+                    /*OnlineId =*/
+                    sr.ReadInt32();
+
+                using (var replayInStream = new MemoryStream(compressedReplay))
+                {
+                    byte[] properties = new byte[5];
+                    if (replayInStream.Read(properties, 0, 5) != 5)
+                        throw new Exception("input .lzma is too short");
+                    long outSize = 0;
+                    for (int i = 0; i < 8; i++)
+                    {
+                        int v = replayInStream.ReadByte();
+                        if (v < 0)
+                            throw new Exception("Can't Read 1");
+                        outSize |= (long)(byte)v << (8 * i);
+                    }
+
+                    long compressedSize = replayInStream.Length - replayInStream.Position;
+
+                    using (var lzma = new LzmaStream(properties, replayInStream, compressedSize, outSize))
+                    using (var reader = new StreamReader(lzma))
+                        score.Replay = new LegacyReplay(reader);
+                }
+            }
+            
+            return score;
+        }
+    }
+}
diff --git a/osu.Game/Graphics/Backgrounds/Background.cs b/osu.Game/Graphics/Backgrounds/Background.cs
index c35006f416..5bafc8cd64 100644
--- a/osu.Game/Graphics/Backgrounds/Background.cs
+++ b/osu.Game/Graphics/Backgrounds/Background.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Graphics.Backgrounds
     {
         public Sprite Sprite;
 
-        string textureName;
+        private string textureName;
 
         public Background(string textureName = @"")
         {
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index f3b75ce91a..4c50162194 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -10,7 +10,6 @@ using osu.Framework.MathUtils;
 using OpenTK;
 using OpenTK.Graphics;
 using System;
-using osu.Framework.Graphics.Colour;
 
 namespace osu.Game.Graphics.Backgrounds
 {
@@ -118,7 +117,7 @@ namespace osu.Game.Graphics.Backgrounds
         private void addTriangle(bool randomY)
         {
             var sprite = CreateTriangle();
-            float triangleHeight = (sprite.DrawHeight / DrawHeight);
+            float triangleHeight = sprite.DrawHeight / DrawHeight;
             sprite.Position = new Vector2(RNG.NextSingle(), randomY ? RNG.NextSingle() * (1 + triangleHeight) - triangleHeight : 1);
             Add(sprite);
         }
diff --git a/osu.Game/Graphics/Components/FpsDisplay.cs b/osu.Game/Graphics/Components/FpsDisplay.cs
deleted file mode 100644
index c2e5d75059..0000000000
--- a/osu.Game/Graphics/Components/FpsDisplay.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Containers;
-
-namespace osu.Game.Graphics.Components
-{
-    class FpsDisplay : OsuComponent
-    {
-        SpriteText fpsText;
-        public override void Load()
-        {
-            base.Load();
-
-            Add(fpsText = new SpriteText());
-
-            fpsText.Text = "...";
-        }
-
-        protected override void Update()
-        {
-            fpsText.Text = ((int)(1000 / Clock.ElapsedFrameTime)).ToString();
-            base.Update();
-        }
-    }
-}
diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs
index 1908bd0aa2..88627dbd30 100644
--- a/osu.Game/Graphics/Containers/ParallaxContainer.cs
+++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs
@@ -12,7 +12,7 @@ using osu.Framework.Configuration;
 
 namespace osu.Game.Graphics.Containers
 {
-    class ParallaxContainer : Container
+    internal class ParallaxContainer : Container
     {
         public float ParallaxAmount = 0.02f;
 
@@ -51,7 +51,7 @@ namespace osu.Game.Graphics.Containers
             };
         }
 
-        bool firstUpdate = true;
+        private bool firstUpdate = true;
 
         protected override void Update()
         {
diff --git a/osu.Game/Graphics/Cursor/CursorTrail.cs b/osu.Game/Graphics/Cursor/CursorTrail.cs
index 7e0937155c..09d1193661 100644
--- a/osu.Game/Graphics/Cursor/CursorTrail.cs
+++ b/osu.Game/Graphics/Cursor/CursorTrail.cs
@@ -16,8 +16,7 @@ using osu.Framework.Graphics.Colour;
 
 namespace osu.Game.Graphics.Cursor
 {
-
-    class CursorTrail : Drawable
+    internal class CursorTrail : Drawable
     {
         public override bool Contains(Vector2 screenSpacePos) => true;
         public override bool HandleInput => true;
@@ -32,7 +31,7 @@ namespace osu.Game.Graphics.Cursor
         private double timeOffset;
 
         private float time;
-        
+
         private TrailDrawNodeSharedData trailDrawNodeSharedData = new TrailDrawNodeSharedData();
         private const int max_sprites = 2048;
 
@@ -46,7 +45,7 @@ namespace osu.Game.Graphics.Cursor
         {
             base.ApplyDrawNode(node);
 
-            TrailDrawNode tNode = node as TrailDrawNode;
+            TrailDrawNode tNode = (TrailDrawNode)node;
             tNode.Shader = shader;
             tNode.Texture = texture;
             tNode.Size = size;
@@ -77,6 +76,12 @@ namespace osu.Game.Graphics.Cursor
             Scale = new Vector2(1 / texture.ScaleAdjust);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            resetTime();
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -117,7 +122,7 @@ namespace osu.Game.Graphics.Cursor
             float distance = diff.Length;
             Vector2 direction = diff / distance;
 
-            float interval = (size.X / 2) * 0.9f;
+            float interval = size.X / 2 * 0.9f;
 
             for (float d = interval; d < distance; d += interval)
             {
@@ -137,7 +142,7 @@ namespace osu.Game.Graphics.Cursor
             currentIndex = (currentIndex + 1) % max_sprites;
         }
 
-        struct TrailPart
+        private struct TrailPart
         {
             public Vector2 Position;
             public float Time;
@@ -145,12 +150,12 @@ namespace osu.Game.Graphics.Cursor
             public bool WasUpdated;
         }
 
-        class TrailDrawNodeSharedData
+        private class TrailDrawNodeSharedData
         {
             public VertexBuffer<TexturedVertex2D> VertexBuffer;
         }
 
-        class TrailDrawNode : DrawNode
+        private class TrailDrawNode : DrawNode
         {
             public Shader Shader;
             public Texture Texture;
diff --git a/osu.Game/Graphics/Cursor/OsuCursorContainer.cs b/osu.Game/Graphics/Cursor/OsuCursorContainer.cs
index ab681845af..8b71182263 100644
--- a/osu.Game/Graphics/Cursor/OsuCursorContainer.cs
+++ b/osu.Game/Graphics/Cursor/OsuCursorContainer.cs
@@ -5,11 +5,11 @@ using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Configuration;
@@ -17,7 +17,7 @@ using System;
 
 namespace osu.Game.Graphics.Cursor
 {
-    class OsuCursorContainer : CursorContainer
+    public class OsuCursorContainer : CursorContainer
     {
         protected override Drawable CreateCursor() => new OsuCursor();
 
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.Cursor
             return base.OnMouseUp(state, args);
         }
 
-        class OsuCursor : Container
+        public class OsuCursor : Container
         {
             private Container cursorContainer;
             private Bindable<double> cursorScale;
diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 5d9745b8a2..d8de4f6346 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -6,12 +6,6 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Graphics
 {
-    public static class OsuColourExtensions
-    {
-        public static Color4 Opacity(this Color4 color, float a) => new Color4(color.R, color.G, color.B, a);
-        public static Color4 Opacity(this Color4 color, byte a) => new Color4(color.R, color.G, color.B, a / 255f);
-    }
-
     public class OsuColour
     {
         public static Color4 Gray(float amt) => new Color4(amt, amt, amt, 1f);
diff --git a/osu.Game/Graphics/Processing/RatioAdjust.cs b/osu.Game/Graphics/Processing/RatioAdjust.cs
index 72d81733e5..219d75c675 100644
--- a/osu.Game/Graphics/Processing/RatioAdjust.cs
+++ b/osu.Game/Graphics/Processing/RatioAdjust.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Graphics.Processing
 {
-    class RatioAdjust : Container
+    internal class RatioAdjust : Container
     {
         public override bool Contains(Vector2 screenSpacePos) => true;
 
diff --git a/osu.Game/Graphics/TextAwesome.cs b/osu.Game/Graphics/TextAwesome.cs
index 03769e6f6b..45f9ddeec9 100644
--- a/osu.Game/Graphics/TextAwesome.cs
+++ b/osu.Game/Graphics/TextAwesome.cs
@@ -26,11 +26,6 @@ namespace osu.Game.Graphics
                 Text = ((char)icon).ToString();
             }
         }
-
-        public TextAwesome()
-        {
-            Origin = Framework.Graphics.Anchor.Centre;
-        }
     }
 
     public enum FontAwesome
@@ -902,6 +897,6 @@ namespace osu.Game.Graphics
         fa_osu_mod_spunout = 0xe046,
         fa_osu_mod_suddendeath = 0xe047,
         fa_osu_mod_target = 0xe048,
-        fa_osu_mod_bg = 0xe049,
+        fa_osu_mod_bg = 0xe04a,
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs
index fc7d142a8f..590c5bf393 100644
--- a/osu.Game/Graphics/UserInterface/DialogButton.cs
+++ b/osu.Game/Graphics/UserInterface/DialogButton.cs
@@ -9,9 +9,9 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Audio.Sample;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -100,7 +100,7 @@ namespace osu.Game.Graphics.UserInterface
 
             Delay(click_duration);
             Schedule(delegate {
-                colourContainer.ResizeTo(new Vector2(0.8f, 1f), 0, EasingTypes.None);
+                colourContainer.ResizeTo(new Vector2(0.8f, 1f));
                 spriteText.Spacing = Vector2.Zero;
                 glowContainer.FadeOut();
             });
diff --git a/osu.Game/Graphics/UserInterface/Nub.cs b/osu.Game/Graphics/UserInterface/Nub.cs
index a64b36208e..6f3529b67d 100644
--- a/osu.Game/Graphics/UserInterface/Nub.cs
+++ b/osu.Game/Graphics/UserInterface/Nub.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Graphics.UserInterface
 
         private Box fill;
 
-        const float border_width = 3;
+        private const float border_width = 3;
         private Color4 glowingColour, idleColour;
 
         public Nub()
diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index 5b9812346c..b2da5d7b4b 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -3,6 +3,7 @@
 
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs b/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs
index 3fc83afb52..176c066af5 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
 using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs b/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
index 0bcf4f2100..b9ebcff65a 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -35,10 +36,7 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override void UpdateContentHeight()
         {
-            if (State == DropDownMenuState.Opened)
-                ContentContainer.ResizeTo(new Vector2(1, ContentHeight), 300, EasingTypes.OutQuint);
-            else
-                ContentContainer.ResizeTo(new Vector2(1, 0), 300, EasingTypes.OutQuint);
+            ContentContainer.ResizeTo(State == DropDownMenuState.Opened ? new Vector2(1, ContentHeight) : new Vector2(1, 0), 300, EasingTypes.OutQuint);
         }
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
index d654299279..b06422c302 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -21,7 +22,7 @@ namespace osu.Game.Graphics.UserInterface
             {
                 new FillFlowContainer
                 {
-                    Direction = FillDirection.Right,
+                    Direction = FillDirection.Horizontal,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Children = new Drawable[]
diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index 85b1a1a338..df48694249 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Graphics.UserInterface
     {
         protected override Drawable GetDrawableCharacter(char c) => new PasswordMaskChar(CalculatedTextSize);
 
+        public override bool AllowClipboardExport => false;
+
         public class PasswordMaskChar : Container
         {
             private CircularContainer circle;
diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index d7bc245027..a54b122615 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Game.Graphics.Sprites;
 using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
index ee4066b336..66c9e7d461 100644
--- a/osu.Game/Graphics/UserInterface/PercentageCounter.cs
+++ b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
+using osu.Framework.MathUtils;
 using System;
 
 namespace osu.Game.Graphics.UserInterface
@@ -10,7 +11,7 @@ namespace osu.Game.Graphics.UserInterface
     /// <summary>
     /// Used as an accuracy counter. Represented visually as a percentage.
     /// </summary>
-    public class PercentageCounter : RollingCounter<float>
+    public class PercentageCounter : RollingCounter<double>
     {
         protected override Type TransformType => typeof(TransformAccuracy);
 
@@ -20,36 +21,48 @@ namespace osu.Game.Graphics.UserInterface
 
         public void SetFraction(float numerator, float denominator)
         {
-            Count = Math.Abs(denominator) < epsilon ? 1.0f : numerator / denominator;
+            Current.Value = Math.Abs(denominator) < epsilon ? 1.0f : numerator / denominator;
         }
 
         public PercentageCounter()
         {
             DisplayedCountSpriteText.FixedWidth = true;
-            Count = 1.0f;
+            Current.Value = DisplayedCount = 1.0f;
         }
 
-        protected override string FormatCount(float count)
+        protected override string FormatCount(double count)
         {
             return $@"{count:P2}";
         }
 
-        protected override double GetProportionalDuration(float currentValue, float newValue)
+        protected override double GetProportionalDuration(double currentValue, double newValue)
         {
             return Math.Abs(currentValue - newValue) * RollingDuration * 100.0f;
         }
 
-        public override void Increment(float amount)
+        public override void Increment(double amount)
         {
-            Count = Count + amount;
+            Current.Value = Current + amount;
         }
 
-        protected class TransformAccuracy : TransformFloat
+        protected class TransformAccuracy : Transform<double>
         {
+            protected override double CurrentValue
+            {
+                get
+                {
+                    double time = Time?.Current ?? 0;
+                    if (time < StartTime) return StartValue;
+                    if (time >= EndTime) return EndValue;
+
+                    return Interpolation.ValueAt(time, (float)StartValue, (float)EndValue, StartTime, EndTime, Easing);
+                }
+            }
+
             public override void Apply(Drawable d)
             {
                 base.Apply(d);
-                (d as PercentageCounter).DisplayedCount = CurrentValue;
+                ((PercentageCounter)d).DisplayedCount = CurrentValue;
             }
         }
     }
diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index 9d45b13ca9..a4f6092d66 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -1,24 +1,30 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
+using osu.Game.Graphics.Sprites;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
     public abstract class RollingCounter<T> : Container
     {
+        /// <summary>
+        /// The current value.
+        /// </summary>
+        public Bindable<T> Current = new Bindable<T>();
+
         /// <summary>
         /// Type of the Transform to use.
         /// </summary>
         /// <remarks>
-        /// Must be a subclass of Transform<T>
+        /// Must be a subclass of Transform(T)
         /// </remarks>
         protected virtual Type TransformType => typeof(Transform<T>);
 
@@ -60,32 +66,6 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        private T count;
-
-        /// <summary>
-        /// Actual value of counter.
-        /// </summary>
-        public virtual T Count
-        {
-            get
-            {
-                return count;
-            }
-            set
-            {
-                count = value;
-                if (IsLoaded)
-                {
-                    TransformCount(displayedCount, count);
-                }
-            }
-        }
-
-        public void Set(T value)
-        {
-            Count = value;
-        }
-
         public abstract void Increment(T amount);
 
         private float textSize;
@@ -107,7 +87,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             Children = new Drawable[]
             {
-                DisplayedCountSpriteText = new OsuSpriteText()
+                DisplayedCountSpriteText = new OsuSpriteText
                 {
                     Font = @"Venera"
                 },
@@ -116,7 +96,15 @@ namespace osu.Game.Graphics.UserInterface
             TextSize = 40;
             AutoSizeAxes = Axes.Both;
 
-            DisplayedCount = Count;
+            DisplayedCount = Current;
+
+            Current.ValueChanged += currentChanged;
+        }
+
+        private void currentChanged(object sender, EventArgs e)
+        {
+            if (IsLoaded)
+                TransformCount(displayedCount, Current);
         }
 
         protected override void LoadComplete()
@@ -125,7 +113,7 @@ namespace osu.Game.Graphics.UserInterface
 
             Flush(false, TransformType);
 
-            DisplayedCountSpriteText.Text = FormatCount(count);
+            DisplayedCountSpriteText.Text = FormatCount(Current);
             DisplayedCountSpriteText.Anchor = Anchor;
             DisplayedCountSpriteText.Origin = Origin;
         }
@@ -136,7 +124,7 @@ namespace osu.Game.Graphics.UserInterface
         /// <param name="count">New count value.</param>
         public virtual void SetCountWithoutRolling(T count)
         {
-            Count = count;
+            Current.Value = count;
             StopRolling();
         }
 
@@ -146,7 +134,7 @@ namespace osu.Game.Graphics.UserInterface
         public virtual void StopRolling()
         {
             Flush(false, TransformType);
-            DisplayedCount = Count;
+            DisplayedCount = Current;
         }
 
         /// <summary>
@@ -211,7 +199,7 @@ namespace osu.Game.Graphics.UserInterface
 
             if (RollingDuration < 1)
             {
-                DisplayedCount = Count;
+                DisplayedCount = Current;
                 return;
             }
 
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index ebe5b63c5a..c9a1040185 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
@@ -8,7 +8,7 @@ using System;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class ScoreCounter : RollingCounter<ulong>
+    public class ScoreCounter : RollingCounter<double>
     {
         protected override Type TransformType => typeof(TransformScore);
 
@@ -34,24 +34,24 @@ namespace osu.Game.Graphics.UserInterface
             LeadingZeroes = leading;
         }
 
-        protected override double GetProportionalDuration(ulong currentValue, ulong newValue)
+        protected override double GetProportionalDuration(double currentValue, double newValue)
         {
             return currentValue > newValue ? currentValue - newValue : newValue - currentValue;
         }
 
-        protected override string FormatCount(ulong count)
+        protected override string FormatCount(double count)
         {
-            return count.ToString("D" + LeadingZeroes);
+            return ((long)count).ToString("D" + LeadingZeroes);
         }
 
-        public override void Increment(ulong amount)
+        public override void Increment(double amount)
         {
-            Count = Count + amount;
+            Current.Value = Current + amount;
         }
 
-        protected class TransformScore : Transform<ulong>
+        protected class TransformScore : Transform<double>
         {
-            protected override ulong CurrentValue
+            protected override double CurrentValue
             {
                 get
                 {
@@ -59,14 +59,14 @@ namespace osu.Game.Graphics.UserInterface
                     if (time < StartTime) return StartValue;
                     if (time >= EndTime) return EndValue;
 
-                    return (ulong)Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
+                    return Interpolation.ValueAt(time, (float)StartValue, (float)EndValue, StartTime, EndTime, Easing);
                 }
             }
 
             public override void Apply(Drawable d)
             {
                 base.Apply(d);
-                (d as ScoreCounter).DisplayedCount = CurrentValue;
+                ((ScoreCounter)d).DisplayedCount = CurrentValue;
             }
         }
     }
diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index 10ffcffa7f..c46eda6582 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Graphics.UserInterface
         private float minStarAlpha => 0.5f;
 
         private const float star_size = 20;
-        private float star_spacing = 4;
+        private const float star_spacing = 4;
 
         private float count;
 
@@ -71,7 +71,7 @@ namespace osu.Game.Graphics.UserInterface
                 stars = new FillFlowContainer<Star>
                 {
                     AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Right,
+                    Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(star_spacing),
                 }
             };
@@ -123,7 +123,7 @@ namespace osu.Game.Graphics.UserInterface
             if (value <= i)
                 return minStarScale;
 
-            return i + 1 <= value ? 1.0f : Interpolation.ValueAt(value, minStarScale, 1.0f, i, i + 1);
+            return i + 1 <= value ? 1.0f : (float)Interpolation.ValueAt(value, minStarScale, 1.0f, i, i + 1);
         }
 
         private void transformCount(float newValue)
@@ -145,7 +145,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        class Star : Container
+        private class Star : Container
         {
             public TextAwesome Icon;
             public Star()
diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
index bd3574b625..8221ef952f 100644
--- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
@@ -4,13 +4,13 @@
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -57,10 +57,7 @@ namespace osu.Game.Graphics.UserInterface
                 c1.Origin = c1.Anchor = (value & Anchor.x2) > 0 ? Anchor.TopLeft : Anchor.TopRight;
                 c2.Origin = c2.Anchor = (value & Anchor.x2) > 0 ? Anchor.TopRight : Anchor.TopLeft;
 
-                Margin = new MarginPadding
-                {
-                    Right = (value & Anchor.x2) > 0 ? -SIZE_RETRACTED.X * shear * 0.5f : 0
-                };
+                X = (value & Anchor.x2) > 0 ? SIZE_RETRACTED.X * shear * 0.5f : 0;
 
                 c1.Depth = (value & Anchor.x2) > 0 ? 0 : 1;
                 c2.Depth = (value & Anchor.x2) > 0 ? 1 : 0;
@@ -101,6 +98,7 @@ namespace osu.Game.Graphics.UserInterface
                         icon = new TextAwesome
                         {
                             Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
                             TextSize = 25,
                         },
                     }
diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
index 04ba2fcd2f..a9f09ce86c 100644
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
+++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
             volumeMeterMusic.Bindable.BindTo(audio.VolumeTrack);
         }
 
-        ScheduledDelegate popOutDelegate;
+        private ScheduledDelegate popOutDelegate;
 
         private VolumeMeter volumeMeterEffect;
         private VolumeMeter volumeMeterMusic;
diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs
index c12f01fa7c..c155871f33 100644
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControlReceptor.cs
@@ -8,7 +8,7 @@ using OpenTK.Input;
 
 namespace osu.Game.Graphics.UserInterface.Volume
 {
-    class VolumeControlReceptor : Container
+    internal class VolumeControlReceptor : Container
     {
         public Action<InputState> ActionRequested;
 
diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs
index 1a2589a7a9..4d68177fef 100644
--- a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs
+++ b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
     internal class VolumeMeter : Container
     {
         private Box meterFill;
-        public BindableDouble Bindable { get; private set; } = new BindableDouble();
+        public BindableDouble Bindable { get; } = new BindableDouble();
 
         public VolumeMeter(string meterName)
         {
diff --git a/osu.Game/IO/Legacy/ILegacySerializable.cs b/osu.Game/IO/Legacy/ILegacySerializable.cs
new file mode 100644
index 0000000000..a280a5d13a
--- /dev/null
+++ b/osu.Game/IO/Legacy/ILegacySerializable.cs
@@ -0,0 +1,11 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.IO.Legacy
+{
+    public interface ILegacySerializable
+    {
+        void ReadFromStream(SerializationReader sr);
+        void WriteToStream(SerializationWriter sw);
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/IO/Legacy/SerializationReader.cs b/osu.Game/IO/Legacy/SerializationReader.cs
new file mode 100644
index 0000000000..6cab5c534d
--- /dev/null
+++ b/osu.Game/IO/Legacy/SerializationReader.cs
@@ -0,0 +1,278 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Text;
+using System.Threading;
+
+namespace osu.Game.IO.Legacy
+{
+    /// <summary> SerializationReader.  Extends BinaryReader to add additional data types,
+    /// handle null strings and simplify use with ISerializable. </summary>
+    public class SerializationReader : BinaryReader
+    {
+        private Stream stream;
+
+        public SerializationReader(Stream s)
+            : base(s, Encoding.UTF8)
+        {
+            stream = s;
+        }
+
+        public int RemainingBytes => (int)(stream.Length - stream.Position);
+
+        /// <summary> Static method to take a SerializationInfo object (an input to an ISerializable constructor)
+        /// and produce a SerializationReader from which serialized objects can be read </summary>.
+        public static SerializationReader GetReader(SerializationInfo info)
+        {
+            byte[] byteArray = (byte[])info.GetValue("X", typeof(byte[]));
+            MemoryStream ms = new MemoryStream(byteArray);
+            return new SerializationReader(ms);
+        }
+
+        /// <summary> Reads a string from the buffer.  Overrides the base implementation so it can cope with nulls. </summary>
+        public override string ReadString()
+        {
+            if (0 == ReadByte()) return null;
+            return base.ReadString();
+        }
+
+        /// <summary> Reads a byte array from the buffer, handling nulls and the array length. </summary>
+        public byte[] ReadByteArray()
+        {
+            int len = ReadInt32();
+            if (len > 0) return ReadBytes(len);
+            if (len < 0) return null;
+            return new byte[0];
+        }
+
+        /// <summary> Reads a char array from the buffer, handling nulls and the array length. </summary>
+        public char[] ReadCharArray()
+        {
+            int len = ReadInt32();
+            if (len > 0) return ReadChars(len);
+            if (len < 0) return null;
+            return new char[0];
+        }
+
+        /// <summary> Reads a DateTime from the buffer. </summary>
+        public DateTime ReadDateTime()
+        {
+            long ticks = ReadInt64();
+            if (ticks < 0) throw new AbandonedMutexException("oops");
+            return new DateTime(ticks, DateTimeKind.Utc);
+        }
+
+        /// <summary> Reads a generic list from the buffer. </summary>
+        public IList<T> ReadBList<T>(bool skipErrors = false) where T : ILegacySerializable, new()
+        {
+            int count = ReadInt32();
+            if (count < 0) return null;
+            IList<T> d = new List<T>(count);
+
+            SerializationReader sr = new SerializationReader(BaseStream);
+
+            for (int i = 0; i < count; i++)
+            {
+                T obj = new T();
+                try
+                {
+                    obj.ReadFromStream(sr);
+                }
+                catch (Exception)
+                {
+                    if (skipErrors)
+                        continue;
+                    throw;
+                }
+
+                d.Add(obj);
+            }
+
+            return d;
+        }
+
+        /// <summary> Reads a generic list from the buffer. </summary>
+        public IList<T> ReadList<T>()
+        {
+            int count = ReadInt32();
+            if (count < 0) return null;
+            IList<T> d = new List<T>(count);
+            for (int i = 0; i < count; i++) d.Add((T)ReadObject());
+            return d;
+        }
+
+        /// <summary> Reads a generic Dictionary from the buffer. </summary>
+        public IDictionary<T, U> ReadDictionary<T, U>()
+        {
+            int count = ReadInt32();
+            if (count < 0) return null;
+            IDictionary<T, U> d = new Dictionary<T, U>();
+            for (int i = 0; i < count; i++) d[(T)ReadObject()] = (U)ReadObject();
+            return d;
+        }
+
+        /// <summary> Reads an object which was added to the buffer by WriteObject. </summary>
+        public object ReadObject()
+        {
+            ObjType t = (ObjType)ReadByte();
+            switch (t)
+            {
+                case ObjType.boolType:
+                    return ReadBoolean();
+                case ObjType.byteType:
+                    return ReadByte();
+                case ObjType.uint16Type:
+                    return ReadUInt16();
+                case ObjType.uint32Type:
+                    return ReadUInt32();
+                case ObjType.uint64Type:
+                    return ReadUInt64();
+                case ObjType.sbyteType:
+                    return ReadSByte();
+                case ObjType.int16Type:
+                    return ReadInt16();
+                case ObjType.int32Type:
+                    return ReadInt32();
+                case ObjType.int64Type:
+                    return ReadInt64();
+                case ObjType.charType:
+                    return ReadChar();
+                case ObjType.stringType:
+                    return base.ReadString();
+                case ObjType.singleType:
+                    return ReadSingle();
+                case ObjType.doubleType:
+                    return ReadDouble();
+                case ObjType.decimalType:
+                    return ReadDecimal();
+                case ObjType.dateTimeType:
+                    return ReadDateTime();
+                case ObjType.byteArrayType:
+                    return ReadByteArray();
+                case ObjType.charArrayType:
+                    return ReadCharArray();
+                case ObjType.otherType:
+                    return DynamicDeserializer.Deserialize(BaseStream);
+                default:
+                    return null;
+            }
+        }
+
+        public class DynamicDeserializer
+        {
+            private static VersionConfigToNamespaceAssemblyObjectBinder versionBinder;
+            private static BinaryFormatter formatter;
+
+            private static void initialize()
+            {
+                versionBinder = new VersionConfigToNamespaceAssemblyObjectBinder();
+                formatter = new BinaryFormatter
+                {
+                    AssemblyFormat = FormatterAssemblyStyle.Simple,
+                    Binder = versionBinder
+                };
+            }
+
+            public static object Deserialize(Stream stream)
+            {
+                if (formatter == null)
+                    initialize();
+
+                Debug.Assert(formatter != null, "formatter != null");
+
+                return formatter.Deserialize(stream);
+            }
+
+            #region Nested type: VersionConfigToNamespaceAssemblyObjectBinder
+
+            public sealed class VersionConfigToNamespaceAssemblyObjectBinder : SerializationBinder
+            {
+                private readonly Dictionary<string, Type> cache = new Dictionary<string, Type>();
+
+                public override Type BindToType(string assemblyName, string typeName)
+                {
+                    Type typeToDeserialize;
+
+                    if (cache.TryGetValue(assemblyName + typeName, out typeToDeserialize))
+                        return typeToDeserialize;
+
+                    List<Type> tmpTypes = new List<Type>();
+                    Type genType = null;
+
+                    if (typeName.Contains("System.Collections.Generic") && typeName.Contains("[["))
+                    {
+                        string[] splitTyps = typeName.Split('[');
+
+                        foreach (string typ in splitTyps)
+                        {
+                            if (typ.Contains("Version"))
+                            {
+                                string asmTmp = typ.Substring(typ.IndexOf(',') + 1);
+                                string asmName = asmTmp.Remove(asmTmp.IndexOf(']')).Trim();
+                                string typName = typ.Remove(typ.IndexOf(','));
+                                tmpTypes.Add(BindToType(asmName, typName));
+                            }
+                            else if (typ.Contains("Generic"))
+                            {
+                                genType = BindToType(assemblyName, typ);
+                            }
+                        }
+                        if (genType != null && tmpTypes.Count > 0)
+                        {
+                            return genType.MakeGenericType(tmpTypes.ToArray());
+                        }
+                    }
+
+                    string toAssemblyName = assemblyName.Split(',')[0];
+                    Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
+                    foreach (Assembly a in assemblies)
+                    {
+                        if (a.FullName.Split(',')[0] == toAssemblyName)
+                        {
+                            typeToDeserialize = a.GetType(typeName);
+                            break;
+                        }
+                    }
+
+                    cache.Add(assemblyName + typeName, typeToDeserialize);
+
+                    return typeToDeserialize;
+                }
+            }
+
+            #endregion
+        }
+    }
+
+    public enum ObjType : byte
+    {
+        nullType,
+        boolType,
+        byteType,
+        uint16Type,
+        uint32Type,
+        uint64Type,
+        sbyteType,
+        int16Type,
+        int32Type,
+        int64Type,
+        charType,
+        stringType,
+        singleType,
+        doubleType,
+        decimalType,
+        dateTimeType,
+        byteArrayType,
+        charArrayType,
+        otherType,
+        ILegacySerializableType
+    }
+}
diff --git a/osu.Game/IO/Legacy/SerializationWriter.cs b/osu.Game/IO/Legacy/SerializationWriter.cs
new file mode 100644
index 0000000000..7325129128
--- /dev/null
+++ b/osu.Game/IO/Legacy/SerializationWriter.cs
@@ -0,0 +1,262 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Text;
+// ReSharper disable ConditionIsAlwaysTrueOrFalse (we're allowing nulls to be passed to the writer where the underlying class doesn't).
+// ReSharper disable HeuristicUnreachableCode
+
+namespace osu.Game.IO.Legacy
+{
+    /// <summary> SerializationWriter.  Extends BinaryWriter to add additional data types,
+    /// handle null strings and simplify use with ISerializable. </summary>
+    public class SerializationWriter : BinaryWriter
+    {
+        public SerializationWriter(Stream s)
+            : base(s, Encoding.UTF8)
+        {
+        }
+
+        /// <summary> Static method to initialise the writer with a suitable MemoryStream. </summary>
+        public static SerializationWriter GetWriter()
+        {
+            MemoryStream ms = new MemoryStream(1024);
+            return new SerializationWriter(ms);
+        }
+
+        /// <summary> Writes a string to the buffer.  Overrides the base implementation so it can cope with nulls </summary>
+        public override void Write(string str)
+        {
+            if (str == null)
+            {
+                Write((byte)ObjType.nullType);
+            }
+            else
+            {
+                Write((byte)ObjType.stringType);
+                base.Write(str);
+            }
+        }
+
+        /// <summary> Writes a byte array to the buffer.  Overrides the base implementation to
+        /// send the length of the array which is needed when it is retrieved </summary>
+        public override void Write(byte[] b)
+        {
+            if (b == null)
+            {
+                Write(-1);
+            }
+            else
+            {
+                int len = b.Length;
+                Write(len);
+                if (len > 0) base.Write(b);
+            }
+        }
+
+        /// <summary> Writes a char array to the buffer.  Overrides the base implementation to
+        /// sends the length of the array which is needed when it is read. </summary>
+        public override void Write(char[] c)
+        {
+            if (c == null)
+            {
+                Write(-1);
+            }
+            else
+            {
+                int len = c.Length;
+                Write(len);
+                if (len > 0) base.Write(c);
+            }
+        }
+
+        /// <summary>
+        /// Writes DateTime to the buffer.
+        /// </summary>
+        /// <param name="dt"></param>
+        public void Write(DateTime dt)
+        {
+            Write(dt.ToUniversalTime().Ticks);
+        }
+
+        /// <summary> Writes a generic ICollection (such as an IList(T)) to the buffer.</summary>
+        public void Write<T>(List<T> c) where T : ILegacySerializable
+        {
+            if (c == null)
+            {
+                Write(-1);
+            }
+            else
+            {
+                int count = c.Count;
+                Write(count);
+                for (int i = 0; i < count; i++)
+                    c[i].WriteToStream(this);
+            }
+        }
+
+        /// <summary> Writes a generic IDictionary to the buffer. </summary>
+        public void Write<T, U>(IDictionary<T, U> d)
+        {
+            if (d == null)
+            {
+                Write(-1);
+            }
+            else
+            {
+                Write(d.Count);
+                foreach (KeyValuePair<T, U> kvp in d)
+                {
+                    WriteObject(kvp.Key);
+                    WriteObject(kvp.Value);
+                }
+            }
+        }
+
+        /// <summary> Writes an arbitrary object to the buffer.  Useful where we have something of type "object"
+        /// and don't know how to treat it.  This works out the best method to use to write to the buffer. </summary>
+        public void WriteObject(object obj)
+        {
+            if (obj == null)
+            {
+                Write((byte)ObjType.nullType);
+            }
+            else
+            {
+                switch (obj.GetType().Name)
+                {
+                    case "Boolean":
+                        Write((byte)ObjType.boolType);
+                        Write((bool)obj);
+                        break;
+
+                    case "Byte":
+                        Write((byte)ObjType.byteType);
+                        Write((byte)obj);
+                        break;
+
+                    case "UInt16":
+                        Write((byte)ObjType.uint16Type);
+                        Write((ushort)obj);
+                        break;
+
+                    case "UInt32":
+                        Write((byte)ObjType.uint32Type);
+                        Write((uint)obj);
+                        break;
+
+                    case "UInt64":
+                        Write((byte)ObjType.uint64Type);
+                        Write((ulong)obj);
+                        break;
+
+                    case "SByte":
+                        Write((byte)ObjType.sbyteType);
+                        Write((sbyte)obj);
+                        break;
+
+                    case "Int16":
+                        Write((byte)ObjType.int16Type);
+                        Write((short)obj);
+                        break;
+
+                    case "Int32":
+                        Write((byte)ObjType.int32Type);
+                        Write((int)obj);
+                        break;
+
+                    case "Int64":
+                        Write((byte)ObjType.int64Type);
+                        Write((long)obj);
+                        break;
+
+                    case "Char":
+                        Write((byte)ObjType.charType);
+                        base.Write((char)obj);
+                        break;
+
+                    case "String":
+                        Write((byte)ObjType.stringType);
+                        base.Write((string)obj);
+                        break;
+
+                    case "Single":
+                        Write((byte)ObjType.singleType);
+                        Write((float)obj);
+                        break;
+
+                    case "Double":
+                        Write((byte)ObjType.doubleType);
+                        Write((double)obj);
+                        break;
+
+                    case "Decimal":
+                        Write((byte)ObjType.decimalType);
+                        Write((decimal)obj);
+                        break;
+
+                    case "DateTime":
+                        Write((byte)ObjType.dateTimeType);
+                        Write((DateTime)obj);
+                        break;
+
+                    case "Byte[]":
+                        Write((byte)ObjType.byteArrayType);
+                        base.Write((byte[])obj);
+                        break;
+
+                    case "Char[]":
+                        Write((byte)ObjType.charArrayType);
+                        base.Write((char[])obj);
+                        break;
+
+                    default:
+                        Write((byte)ObjType.otherType);
+                        BinaryFormatter b = new BinaryFormatter
+                        {
+                            AssemblyFormat = FormatterAssemblyStyle.Simple,
+                            TypeFormat = FormatterTypeStyle.TypesWhenNeeded
+                        };
+                        b.Serialize(BaseStream, obj);
+                        break;
+                } // switch
+            } // if obj==null
+        } // WriteObject
+
+        /// <summary> Adds the SerializationWriter buffer to the SerializationInfo at the end of GetObjectData(). </summary>
+        public void AddToInfo(SerializationInfo info)
+        {
+            byte[] b = ((MemoryStream)BaseStream).ToArray();
+            info.AddValue("X", b, typeof(byte[]));
+        }
+
+        public void WriteRawBytes(byte[] b)
+        {
+            base.Write(b);
+        }
+
+        public void WriteByteArray(byte[] b)
+        {
+            if (b == null)
+            {
+                Write(-1);
+            }
+            else
+            {
+                int len = b.Length;
+                Write(len);
+                if (len > 0) base.Write(b);
+            }
+        }
+
+        public void WriteUtf8(string str)
+        {
+            WriteRawBytes(Encoding.UTF8.GetBytes(str));
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/IPC/BeatmapIPCChannel.cs b/osu.Game/IPC/BeatmapIPCChannel.cs
new file mode 100644
index 0000000000..2b98d5254f
--- /dev/null
+++ b/osu.Game/IPC/BeatmapIPCChannel.cs
@@ -0,0 +1,46 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Diagnostics;
+using System.Threading.Tasks;
+using osu.Framework.Platform;
+using osu.Game.Database;
+
+namespace osu.Game.IPC
+{
+    public class BeatmapIPCChannel : IpcChannel<BeatmapImportMessage>
+    {
+        private BeatmapDatabase beatmaps;
+
+        public BeatmapIPCChannel(IIpcHost host, BeatmapDatabase beatmaps = null)
+            : base(host)
+        {
+            this.beatmaps = beatmaps;
+            MessageReceived += msg =>
+            {
+                Debug.Assert(beatmaps != null);
+                ImportAsync(msg.Path).ContinueWith(t =>
+                {
+                    if (t.Exception != null) throw t.Exception;
+                }, TaskContinuationOptions.OnlyOnFaulted);
+            };
+        }
+
+        public async Task ImportAsync(string path)
+        {
+            if (beatmaps == null)
+            {
+                //we want to contact a remote osu! to handle the import.
+                await SendMessageAsync(new BeatmapImportMessage { Path = path });
+                return;
+            }
+
+            beatmaps.Import(path);
+        }
+    }
+
+    public class BeatmapImportMessage
+    {
+        public string Path;
+    }
+}
diff --git a/osu.Game/IPC/BeatmapImporter.cs b/osu.Game/IPC/BeatmapImporter.cs
deleted file mode 100644
index b6ce4d1e35..0000000000
--- a/osu.Game/IPC/BeatmapImporter.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.Diagnostics;
-using System.Threading.Tasks;
-using osu.Framework.Platform;
-using osu.Game.Database;
-
-namespace osu.Game.IPC
-{
-    public class BeatmapImporter
-    {
-        private IpcChannel<BeatmapImportMessage> channel;
-        private BeatmapDatabase beatmaps;
-
-        public BeatmapImporter(GameHost host,  BeatmapDatabase beatmaps = null)
-        {
-            this.beatmaps = beatmaps;
-
-            channel = new IpcChannel<BeatmapImportMessage>(host);
-            channel.MessageReceived += messageReceived;
-        }
-
-        public async Task ImportAsync(string path)
-        {
-            if (beatmaps != null)
-                beatmaps.Import(path);
-            else
-            {
-                await channel.SendMessageAsync(new BeatmapImportMessage { Path = path });
-            }
-        }
-
-        private void messageReceived(BeatmapImportMessage msg)
-        {
-            Debug.Assert(beatmaps != null);
-
-            ImportAsync(msg.Path);
-        }
-    }
-
-    public class BeatmapImportMessage
-    {
-        public string Path;
-    }
-}
diff --git a/osu.Game/IPC/ScoreIPCChannel.cs b/osu.Game/IPC/ScoreIPCChannel.cs
new file mode 100644
index 0000000000..0a49f4cd8f
--- /dev/null
+++ b/osu.Game/IPC/ScoreIPCChannel.cs
@@ -0,0 +1,46 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Diagnostics;
+using System.Threading.Tasks;
+using osu.Framework.Platform;
+using osu.Game.Database;
+
+namespace osu.Game.IPC
+{
+    public class ScoreIPCChannel : IpcChannel<ScoreImportMessage>
+    {
+        private ScoreDatabase scores;
+
+        public ScoreIPCChannel(IIpcHost host, ScoreDatabase scores = null)
+            : base(host)
+        {
+            this.scores = scores;
+            MessageReceived += msg =>
+            {
+                Debug.Assert(scores != null);
+                ImportAsync(msg.Path).ContinueWith(t =>
+                {
+                    if (t.Exception != null) throw t.Exception;
+                }, TaskContinuationOptions.OnlyOnFaulted);
+            };
+        }
+
+        public async Task ImportAsync(string path)
+        {
+            if (scores == null)
+            {
+                //we want to contact a remote osu! to handle the import.
+                await SendMessageAsync(new ScoreImportMessage { Path = path });
+                return;
+            }
+
+            scores.ReadReplayFile(path);
+        }
+    }
+
+    public class ScoreImportMessage
+    {
+        public string Path;
+    }
+}
diff --git a/osu.Game/Input/Handlers/ReplayInputHandler.cs b/osu.Game/Input/Handlers/ReplayInputHandler.cs
new file mode 100644
index 0000000000..76e038048c
--- /dev/null
+++ b/osu.Game/Input/Handlers/ReplayInputHandler.cs
@@ -0,0 +1,33 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Framework.Input.Handlers;
+using osu.Framework.Platform;
+using OpenTK;
+
+namespace osu.Game.Input.Handlers
+{
+    public abstract class ReplayInputHandler : InputHandler
+    {
+        /// <summary>
+        /// A function provided to convert replay coordinates from gamefield to screen space.
+        /// </summary>
+        public Func<Vector2, Vector2> ToScreenSpace { protected get; set; }
+
+        /// <summary>
+        /// Update the current frame based on an incoming time value.
+        /// There are cases where we return a "must-use" time value that is different from the input.
+        /// This is to ensure accurate playback of replay data.
+        /// </summary>
+        /// <param name="time">The time which we should use for finding the current frame.</param>
+        /// <returns>The usable time value. If null, we should not advance time as we do not have enough data.</returns>
+        public abstract double? SetFrameFromTime(double time);
+
+        public override bool Initialize(GameHost host) => true;
+
+        public override bool IsActive => true;
+
+        public override int Priority => 0;
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Modes/LegacyReplay.cs b/osu.Game/Modes/LegacyReplay.cs
new file mode 100644
index 0000000000..9ab6c587a9
--- /dev/null
+++ b/osu.Game/Modes/LegacyReplay.cs
@@ -0,0 +1,274 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using osu.Framework.Input;
+using osu.Framework.MathUtils;
+using osu.Game.Input.Handlers;
+using osu.Game.IO.Legacy;
+using OpenTK;
+using OpenTK.Input;
+using KeyboardState = osu.Framework.Input.KeyboardState;
+using MouseState = osu.Framework.Input.MouseState;
+
+namespace osu.Game.Modes
+{
+    public class LegacyReplay : Replay
+    {
+        protected List<LegacyReplayFrame> Frames = new List<LegacyReplayFrame>();
+
+        protected LegacyReplay()
+        {
+
+        }
+
+        public LegacyReplay(StreamReader reader)
+        {
+            float lastTime = 0;
+
+            foreach (var l in reader.ReadToEnd().Split(','))
+            {
+                var split = l.Split('|');
+
+                if (split.Length < 4 || float.Parse(split[0]) < 0) continue;
+
+                lastTime += float.Parse(split[0]);
+
+                Frames.Add(new LegacyReplayFrame(
+                    lastTime,
+                    float.Parse(split[1]),
+                    384 - float.Parse(split[2]),
+                    (LegacyButtonState)int.Parse(split[3])
+                    ));
+            }
+        }
+
+        public override ReplayInputHandler GetInputHandler() => new LegacyReplayInputHandler(Frames);
+
+        /// <summary>
+        /// The ReplayHandler will take a replay and handle the propagation of updates to the input stack.
+        /// It handles logic of any frames which *must* be executed.
+        /// </summary>
+        public class LegacyReplayInputHandler : ReplayInputHandler
+        {
+            private readonly List<LegacyReplayFrame> replayContent;
+
+            public LegacyReplayFrame CurrentFrame => !hasFrames ? null : replayContent[currentFrameIndex];
+            public LegacyReplayFrame NextFrame => !hasFrames ? null : replayContent[nextFrameIndex];
+
+            private int currentFrameIndex;
+
+            private int nextFrameIndex => MathHelper.Clamp(currentFrameIndex + (currentDirection > 0 ? 1 : -1), 0, replayContent.Count - 1);
+
+            public LegacyReplayInputHandler(List<LegacyReplayFrame> replayContent)
+            {
+                this.replayContent = replayContent;
+            }
+
+            private bool advanceFrame()
+            {
+                int newFrame = nextFrameIndex;
+
+                //ensure we aren't at an extent.
+                if (newFrame == currentFrameIndex) return false;
+
+                currentFrameIndex = newFrame;
+                return true;
+            }
+
+            public void SetPosition(Vector2 pos)
+            {
+            }
+
+            private Vector2? position
+            {
+                get
+                {
+                    if (!hasFrames)
+                        return null;
+
+                    return Interpolation.ValueAt(currentTime, CurrentFrame.Position, NextFrame.Position, CurrentFrame.Time, NextFrame.Time);
+                }
+            }
+
+            public override List<InputState> GetPendingStates()
+            {
+                return new List<InputState>
+                {
+                    new InputState
+                    {
+                        Mouse = new ReplayMouseState(
+                            ToScreenSpace(position ?? Vector2.Zero),
+                            new List<MouseState.ButtonState>
+                            {
+                                new MouseState.ButtonState(MouseButton.Left)
+                                {
+                                    State = CurrentFrame?.MouseLeft ?? false
+                                },
+                                new MouseState.ButtonState(MouseButton.Right)
+                                {
+                                    State = CurrentFrame?.MouseRight ?? false
+                                },
+                            }
+                        ),
+                        Keyboard = new ReplayKeyboardState(new List<Key>())
+                    }
+                };
+            }
+
+            public bool AtLastFrame => currentFrameIndex == replayContent.Count - 1;
+            public bool AtFirstFrame => currentFrameIndex == 0;
+
+            public Vector2 Size => new Vector2(512, 384);
+
+            private const double sixty_frame_time = 1000.0 / 60;
+
+            private double currentTime;
+            private int currentDirection;
+
+            /// <summary>
+            /// When set, we will ensure frames executed by nested drawables are frame-accurate to replay data.
+            /// Disabling this can make replay playback smoother (useful for autoplay, currently).
+            /// </summary>
+            public bool FrameAccuratePlayback = true;
+
+            private bool hasFrames => replayContent.Count > 0;
+
+            private bool inImportantSection =>
+                FrameAccuratePlayback &&
+                //a button is in a pressed state
+                (currentDirection > 0 ? CurrentFrame : NextFrame)?.ButtonState > LegacyButtonState.None &&
+                //the next frame is within an allowable time span
+                Math.Abs(currentTime - NextFrame?.Time ?? 0) <= sixty_frame_time * 1.2;
+
+            /// <summary>
+            /// Update the current frame based on an incoming time value.
+            /// There are cases where we return a "must-use" time value that is different from the input.
+            /// This is to ensure accurate playback of replay data.
+            /// </summary>
+            /// <param name="time">The time which we should use for finding the current frame.</param>
+            /// <returns>The usable time value. If null, we should not advance time as we do not have enough data.</returns>
+            public override double? SetFrameFromTime(double time)
+            {
+                currentDirection = time.CompareTo(currentTime);
+                if (currentDirection == 0) currentDirection = 1;
+
+                if (hasFrames)
+                {
+                    //if we changed frames, we want to execute once *exactly* on the frame's time.
+                    if (currentDirection == time.CompareTo(NextFrame.Time) && advanceFrame())
+                        return currentTime = CurrentFrame.Time;
+
+                    //if we didn't change frames, we need to ensure we are allowed to run frames in between, else return null.
+                    if (inImportantSection)
+                        return null;
+                }
+
+                return currentTime = time;
+            }
+
+            private class ReplayMouseState : MouseState
+            {
+                public ReplayMouseState(Vector2 position, List<ButtonState> list)
+                {
+                    Position = position;
+                    ButtonStates = list;
+                }
+            }
+
+            private class ReplayKeyboardState : KeyboardState
+            {
+                public ReplayKeyboardState(List<Key> keys)
+                {
+                    Keys = keys;
+                }
+            }
+        }
+
+        [Flags]
+        public enum LegacyButtonState
+        {
+            None = 0,
+            Left1 = 1,
+            Right1 = 2,
+            Left2 = 4,
+            Right2 = 8,
+            Smoke = 16
+        }
+
+        public class LegacyReplayFrame
+        {
+            public Vector2 Position => new Vector2(MouseX, MouseY);
+
+            public float MouseX;
+            public float MouseY;
+            public bool MouseLeft;
+            public bool MouseRight;
+            public bool MouseLeft1;
+            public bool MouseRight1;
+            public bool MouseLeft2;
+            public bool MouseRight2;
+            public LegacyButtonState ButtonState;
+            public double Time;
+
+            public LegacyReplayFrame(double time, float posX, float posY, LegacyButtonState buttonState)
+            {
+                MouseX = posX;
+                MouseY = posY;
+                ButtonState = buttonState;
+                SetButtonStates(buttonState);
+                Time = time;
+            }
+
+            public void SetButtonStates(LegacyButtonState buttonState)
+            {
+                ButtonState = buttonState;
+                MouseLeft = (buttonState & (LegacyButtonState.Left1 | LegacyButtonState.Left2)) > 0;
+                MouseLeft1 = (buttonState & LegacyButtonState.Left1) > 0;
+                MouseLeft2 = (buttonState & LegacyButtonState.Left2) > 0;
+                MouseRight = (buttonState & (LegacyButtonState.Right1 | LegacyButtonState.Right2)) > 0;
+                MouseRight1 = (buttonState & LegacyButtonState.Right1) > 0;
+                MouseRight2 = (buttonState & LegacyButtonState.Right2) > 0;
+            }
+
+            public LegacyReplayFrame(Stream s) : this(new SerializationReader(s))
+            {
+            }
+
+            public LegacyReplayFrame(SerializationReader sr)
+            {
+                ButtonState = (LegacyButtonState)sr.ReadByte();
+                SetButtonStates(ButtonState);
+
+                byte bt = sr.ReadByte();
+                if (bt > 0)//Handle Pre-Taiko compatible replays.
+                    SetButtonStates(LegacyButtonState.Right1);
+
+                MouseX = sr.ReadSingle();
+                MouseY = sr.ReadSingle();
+                Time = sr.ReadInt32();
+            }
+
+            public void ReadFromStream(SerializationReader sr)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void WriteToStream(SerializationWriter sw)
+            {
+                sw.Write((byte)ButtonState);
+                sw.Write((byte)0);
+                sw.Write(MouseX);
+                sw.Write(MouseY);
+                sw.Write(Time);
+            }
+
+            public override string ToString()
+            {
+                return $"{Time}\t({MouseX},{MouseY})\t{MouseLeft}\t{MouseRight}\t{MouseLeft1}\t{MouseRight1}\t{MouseLeft2}\t{MouseRight2}\t{ButtonState}";
+            }
+        }
+    }
+}
diff --git a/osu.Game/Modes/Mod.cs b/osu.Game/Modes/Mod.cs
new file mode 100644
index 0000000000..167421c23d
--- /dev/null
+++ b/osu.Game/Modes/Mod.cs
@@ -0,0 +1,180 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Graphics;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Modes
+{
+    /// <summary>
+    /// The base class for gameplay modifiers.
+    /// </summary>
+    public abstract class Mod
+    {
+        /// <summary>
+        /// The name of this mod.
+        /// </summary>
+        public abstract string Name { get; }
+
+        /// <summary>
+        /// The icon of this mod.
+        /// </summary>
+        public virtual FontAwesome Icon => FontAwesome.fa_question;
+
+        /// <summary>
+        /// The user readable description of this mod.
+        /// </summary>
+        public virtual string Description => string.Empty;
+
+        /// <summary>
+        /// The score multiplier of this mod.
+        /// </summary>
+        public abstract double ScoreMultiplier { get; }
+
+        /// <summary>
+        /// Returns if this mod is ranked.
+        /// </summary>
+        public virtual bool Ranked => false;
+
+        /// <summary>
+        /// The mods this mod cannot be enabled with.
+        /// </summary>
+        public virtual Type[] IncompatibleMods => new Type[] { };
+
+        /// <summary>
+        /// Direct access to the Player before load has run.
+        /// </summary>
+        /// <param name="player"></param>
+        public virtual void PlayerLoading(Player player) { }
+    }
+
+    public class MultiMod : Mod
+    {
+        public override string Name => string.Empty;
+        public override string Description => string.Empty;
+        public override double ScoreMultiplier => 0.0;
+
+        public Mod[] Mods;
+    }
+
+    public abstract class ModNoFail : Mod
+    {
+        public override string Name => "NoFail";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_nofail;
+        public override string Description => "You can't fail, no matter what.";
+        public override double ScoreMultiplier => 0.5;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModAutoplay) };
+    }
+
+    public abstract class ModEasy : Mod
+    {
+        public override string Name => "Easy";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_easy;
+        public override string Description => "Reduces overall difficulty - larger circles, more forgiving HP drain, less accuracy required.";
+        public override double ScoreMultiplier => 0.5;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModHardRock) };
+    }
+
+    public abstract class ModHidden : Mod
+    {
+        public override string Name => "Hidden";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hidden;
+        public override bool Ranked => true;
+    }
+
+    public abstract class ModHardRock : Mod
+    {
+        public override string Name => "Hard Rock";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hardrock;
+        public override string Description => "Everything just got a bit harder...";
+        public override Type[] IncompatibleMods => new[] { typeof(ModEasy) };
+    }
+
+    public abstract class ModSuddenDeath : Mod
+    {
+        public override string Name => "Sudden Death";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_suddendeath;
+        public override string Description => "Miss a note and fail.";
+        public override double ScoreMultiplier => 1;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
+    }
+
+    public abstract class ModDoubleTime : Mod
+    {
+        public override string Name => "Double Time";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_doubletime;
+        public override string Description => "Zoooooooooom";
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModHalfTime) };
+    }
+
+    public abstract class ModRelax : Mod
+    {
+        public override string Name => "Relax";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_relax;
+        public override double ScoreMultiplier => 0;
+        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModSuddenDeath) };
+    }
+
+    public abstract class ModHalfTime : Mod
+    {
+        public override string Name => "Half Time";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_halftime;
+        public override string Description => "Less zoom";
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModDoubleTime) };
+    }
+
+    public abstract class ModNightcore : ModDoubleTime
+    {
+        public override string Name => "Nightcore";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_nightcore;
+        public override string Description => "uguuuuuuuu";
+    }
+
+    public abstract class ModFlashlight : Mod
+    {
+        public override string Name => "Flashlight";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_flashlight;
+        public override string Description => "Restricted view area.";
+        public override bool Ranked => true;
+    }
+
+    public class ModAutoplay : Mod
+    {
+        public override string Name => "Autoplay";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_auto;
+        public override string Description => "Watch a perfect automated play through the song";
+        public override double ScoreMultiplier => 0;
+        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
+
+        public override void PlayerLoading(Player player)
+        {
+            base.PlayerLoading(player);
+            player.ReplayInputHandler = Ruleset.GetRuleset(player.Beatmap.PlayMode).CreateAutoplayScore(player.Beatmap.Beatmap)?.Replay?.GetInputHandler();
+        }
+    }
+
+    public abstract class ModPerfect : ModSuddenDeath
+    {
+        public override string Name => "Perfect";
+        public override string Description => "SS or quit.";
+    }
+
+    public class ModCinema : ModAutoplay
+    {
+        public override string Name => "Cinema";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_cinema;
+    }
+
+    public enum ModType
+    {
+        DifficultyReduction,
+        DifficultyIncrease,
+        Special,
+    }
+}
diff --git a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
index ca1967904a..33ff8a0810 100644
--- a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
@@ -16,22 +16,15 @@ namespace osu.Game.Modes.Objects.Drawables
 {
     public abstract class DrawableHitObject : Container, IStateful<ArmedState>
     {
-        public event Action<DrawableHitObject, JudgementInfo> OnJudgement;
-
         public override bool HandleInput => Interactive;
 
         public bool Interactive = true;
 
         public JudgementInfo Judgement;
 
-        public abstract JudgementInfo CreateJudgementInfo();
+        protected abstract JudgementInfo CreateJudgementInfo();
 
-        public HitObject HitObject;
-
-        public DrawableHitObject(HitObject hitObject)
-        {
-            HitObject = hitObject;
-        }
+        protected abstract void UpdateState(ArmedState state);
 
         private ArmedState state;
         public ArmedState State
@@ -52,20 +45,11 @@ namespace osu.Game.Modes.Objects.Drawables
             }
         }
 
-        SampleChannel sample;
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            string hitType = ((HitObject.Sample?.Type ?? SampleType.None) == SampleType.None ? SampleType.Normal : HitObject.Sample.Type).ToString().ToLower();
-            string sampleSet = (HitObject.Sample?.Set ?? SampleSet.Normal).ToString().ToLower();
-
-            sample = audio.Sample.Get($@"Gameplay/{sampleSet}-hit{hitType}");
-        }
+        protected SampleChannel Sample;
 
         protected virtual void PlaySample()
         {
-            sample?.Play();
+            Sample?.Play();
         }
 
         protected override void LoadComplete()
@@ -81,24 +65,23 @@ namespace osu.Game.Modes.Objects.Drawables
 
             Expire(true);
         }
+    }
 
-        private List<DrawableHitObject> nestedHitObjects;
+    public abstract class DrawableHitObject<HitObjectType> : DrawableHitObject
+        where HitObjectType : HitObject
+    {
+        public event Action<DrawableHitObject<HitObjectType>, JudgementInfo> OnJudgement;
 
-        protected IEnumerable<DrawableHitObject> NestedHitObjects => nestedHitObjects;
+        public HitObjectType HitObject;
 
-        protected void AddNested(DrawableHitObject h)
+        protected DrawableHitObject(HitObjectType hitObject)
         {
-            if (nestedHitObjects == null)
-                nestedHitObjects = new List<DrawableHitObject>();
-
-            h.OnJudgement += (d, j) => { OnJudgement?.Invoke(d, j); } ;
-            nestedHitObjects.Add(h);
+            HitObject = hitObject;
         }
 
         /// <summary>
         /// Process a hit of this hitobject. Carries out judgement.
         /// </summary>
-        /// <param name="judgement">Preliminary judgement information provided by the hit source.</param>
         /// <returns>Whether a hit was processed.</returns>
         protected bool UpdateJudgement(bool userTriggered)
         {
@@ -143,7 +126,30 @@ namespace osu.Game.Modes.Objects.Drawables
             UpdateJudgement(false);
         }
 
-        protected abstract void UpdateState(ArmedState state);
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            SampleType type = HitObject.Sample?.Type ?? SampleType.None;
+            if (type == SampleType.None)
+                type = SampleType.Normal;
+
+            SampleSet sampleSet = HitObject.Sample?.Set ?? SampleSet.Normal;
+
+            Sample = audio.Sample.Get($@"Gameplay/{sampleSet.ToString().ToLower()}-hit{type.ToString().ToLower()}");
+        }
+
+        private List<DrawableHitObject<HitObjectType>> nestedHitObjects;
+
+        protected IEnumerable<DrawableHitObject<HitObjectType>> NestedHitObjects => nestedHitObjects;
+
+        protected void AddNested(DrawableHitObject<HitObjectType> h)
+        {
+            if (nestedHitObjects == null)
+                nestedHitObjects = new List<DrawableHitObject<HitObjectType>>();
+
+            h.OnJudgement += (d, j) => { OnJudgement?.Invoke(d, j); } ;
+            nestedHitObjects.Add(h);
+        }
     }
 
     public enum ArmedState
diff --git a/osu.Game/Modes/PlayMode.cs b/osu.Game/Modes/PlayMode.cs
index 8d1e5158b0..fa6d94a650 100644
--- a/osu.Game/Modes/PlayMode.cs
+++ b/osu.Game/Modes/PlayMode.cs
@@ -1,19 +1,13 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.ComponentModel;
-
 namespace osu.Game.Modes
 {
     public enum PlayMode
     {
-        [Description(@"osu!")]
         Osu = 0,
-        [Description(@"osu!taiko")]
         Taiko = 1,
-        [Description(@"osu!catch")]
         Catch = 2,
-        [Description(@"osu!mania")]
         Mania = 3
     }
 }
diff --git a/osu.Game/Modes/Replay.cs b/osu.Game/Modes/Replay.cs
new file mode 100644
index 0000000000..0a41a12335
--- /dev/null
+++ b/osu.Game/Modes/Replay.cs
@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Input.Handlers;
+
+namespace osu.Game.Modes
+{
+    public abstract class Replay
+    {
+        public virtual ReplayInputHandler GetInputHandler() => null;
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs
index 851e144408..d8892e64e9 100644
--- a/osu.Game/Modes/Ruleset.cs
+++ b/osu.Game/Modes/Ruleset.cs
@@ -1,13 +1,14 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Collections.Generic;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.UI;
-using System;
-using System.Collections.Concurrent;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.UI;
+using osu.Game.Screens.Play;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 
 namespace osu.Game.Modes
 {
@@ -22,11 +23,13 @@ namespace osu.Game.Modes
     {
         private static ConcurrentDictionary<PlayMode, Type> availableRulesets = new ConcurrentDictionary<PlayMode, Type>();
 
-        public abstract ScoreOverlay CreateScoreOverlay();
+        public static IEnumerable<PlayMode> PlayModes => availableRulesets.Keys;
 
         public virtual IEnumerable<BeatmapStatistic> GetBeatmapStatistics(WorkingBeatmap beatmap) => new BeatmapStatistic[] { };
 
-        public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount);
+        public abstract IEnumerable<Mod> GetModsFor(ModType type);
+
+        public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0);
 
         public abstract HitRenderer CreateHitRendererWith(Beatmap beatmap);
 
@@ -40,6 +43,12 @@ namespace osu.Game.Modes
 
         public virtual FontAwesome Icon => FontAwesome.fa_question_circle;
 
+        public abstract string Description { get; }
+
+        public abstract IEnumerable<KeyCounter> CreateGameplayKeys();
+
+        public virtual Score CreateAutoplayScore(Beatmap beatmap) => null;
+
         public static Ruleset GetRuleset(PlayMode mode)
         {
             Type type;
@@ -49,5 +58,6 @@ namespace osu.Game.Modes
 
             return Activator.CreateInstance(type) as Ruleset;
         }
+
     }
 }
diff --git a/osu.Game/Modes/Score.cs b/osu.Game/Modes/Score.cs
index 8da09cb974..4effe9affd 100644
--- a/osu.Game/Modes/Score.cs
+++ b/osu.Game/Modes/Score.cs
@@ -1,14 +1,19 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Database;
+
 namespace osu.Game.Modes
 {
     public class Score
     {
         public double TotalScore { get; set; }
         public double Accuracy { get; set; }
-        public double Combo { get; set; }
-        public double MaxCombo { get; set; }
         public double Health { get; set; }
+        public int MaxCombo { get; set; }
+        public int Combo { get; set; }
+
+        public Replay Replay;
+        public BeatmapInfo Beatmap;
     }
 }
diff --git a/osu.Game/Modes/ScoreProcesssor.cs b/osu.Game/Modes/ScoreProcesssor.cs
index eb4514f40d..554996c145 100644
--- a/osu.Game/Modes/ScoreProcesssor.cs
+++ b/osu.Game/Modes/ScoreProcesssor.cs
@@ -1,16 +1,16 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Collections.Generic;
 using osu.Framework.Configuration;
 using osu.Game.Modes.Objects.Drawables;
+using System;
+using System.Collections.Generic;
 
 namespace osu.Game.Modes
 {
     public abstract class ScoreProcessor
     {
-        public virtual Score GetScore() => new Score()
+        public virtual Score GetScore() => new Score
         {
             TotalScore = TotalScore,
             Combo = Combo,
@@ -51,7 +51,7 @@ namespace osu.Game.Modes
         /// Initializes a new instance of the <see cref="ScoreProcessor"/> class.
         /// </summary>
         /// <param name="hitObjectCount">Number of HitObjects. It is used for specifying Judgements collection Capacity</param>
-        public ScoreProcessor(int hitObjectCount = 0)
+        protected ScoreProcessor(int hitObjectCount = 0)
         {
             Combo.ValueChanged += delegate { HighestCombo.Value = Math.Max(HighestCombo.Value, Combo.Value); };
             Judgements = new List<JudgementInfo>(hitObjectCount);
diff --git a/osu.Game/Modes/UI/ComboCounter.cs b/osu.Game/Modes/UI/ComboCounter.cs
index f669efa673..f831677e44 100644
--- a/osu.Game/Modes/UI/ComboCounter.cs
+++ b/osu.Game/Modes/UI/ComboCounter.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -13,10 +14,12 @@ namespace osu.Game.Modes.UI
 {
     public abstract class ComboCounter : Container
     {
-        public bool IsRolling
+        public BindableInt Current = new BindableInt
         {
-            get; protected set;
-        }
+            MinValue = 0,
+        };
+
+        public bool IsRolling { get; protected set; }
 
         protected SpriteText PopOutCount;
 
@@ -37,60 +40,9 @@ namespace osu.Game.Modes.UI
         /// </summary>
         protected EasingTypes RollingEasing => EasingTypes.None;
 
-        private ulong displayedCount;
-
-        /// <summary>
-        /// Value shown at the current moment.
-        /// </summary>
-        public virtual ulong DisplayedCount
-        {
-            get
-            {
-                return displayedCount;
-            }
-            protected set
-            {
-                if (displayedCount.Equals(value))
-                    return;
-                updateDisplayedCount(displayedCount, value, IsRolling);
-            }
-        }
-
-        private ulong count;
-
-        /// <summary>
-        /// Actual value of counter.
-        /// </summary>
-        public virtual ulong Count
-        {
-            get
-            {
-                return count;
-            }
-            set
-            {
-                updateCount(value);
-            }
-        }
-
-        public void Increment(ulong amount = 1)
-        {
-            Count = Count + amount;
-        }
-
         protected SpriteText DisplayedCountSpriteText;
 
-        private float textSize;
-        public float TextSize
-        {
-            get { return textSize; }
-            set
-            {
-                textSize = value;
-                DisplayedCountSpriteText.TextSize = TextSize;
-                PopOutCount.TextSize = TextSize;
-            }
-        }
+        private int previousValue;
 
         /// <summary>
         /// Base of all combo counters.
@@ -113,81 +65,97 @@ namespace osu.Game.Modes.UI
             };
 
             TextSize = 80;
+
+            Current.ValueChanged += comboChanged;
+        }
+
+        private void comboChanged(object sender, System.EventArgs e)
+        {
+            updateCount(Current.Value == 0);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            DisplayedCountSpriteText.Text = FormatCount(Count);
+            DisplayedCountSpriteText.Text = FormatCount(Current);
             DisplayedCountSpriteText.Anchor = Anchor;
             DisplayedCountSpriteText.Origin = Origin;
 
             StopRolling();
         }
 
+        private int displayedCount;
+        /// <summary>
+        /// Value shown at the current moment.
+        /// </summary>
+        public virtual int DisplayedCount
+        {
+            get { return displayedCount; }
+            protected set
+            {
+                if (displayedCount.Equals(value))
+                    return;
+                updateDisplayedCount(displayedCount, value, IsRolling);
+            }
+        }
+
+        private float textSize;
+        public float TextSize
+        {
+            get { return textSize; }
+            set
+            {
+                textSize = value;
+                DisplayedCountSpriteText.TextSize = TextSize;
+                PopOutCount.TextSize = TextSize;
+            }
+        }
+
+        /// <summary>
+        /// Increments the combo by an amount.
+        /// </summary>
+        /// <param name="amount"></param>
+        public void Increment(int amount = 1)
+        {
+            Current.Value = Current + amount;
+        }
+
         /// <summary>
         /// Stops rollover animation, forcing the displayed count to be the actual count.
         /// </summary>
         public void StopRolling()
         {
-            updateCount(Count);
+            updateCount(false);
         }
 
-        /// <summary>
-        /// Animates roll-back to 0.
-        /// </summary>
-        public void Roll()
-        {
-            Roll(0);
-        }
-
-        /// <summary>
-        /// Animates roll-up/roll-back to an specific value.
-        /// </summary>
-        /// <param name="newValue">Target value.</param>
-        public virtual void Roll(ulong newValue)
-        {
-            updateCount(newValue, true);
-        }
-
-        /// <summary>
-        /// Resets count to default value.
-        /// </summary>
-        public virtual void ResetCount()
-        {
-            updateCount(0);
-        }
-
-        protected virtual string FormatCount(ulong count)
+        protected virtual string FormatCount(int count)
         {
             return count.ToString();
         }
 
-        protected abstract void OnDisplayedCountRolling(ulong currentValue, ulong newValue);
-        protected abstract void OnDisplayedCountIncrement(ulong newValue);
-        protected abstract void OnDisplayedCountChange(ulong newValue);
-
-        protected virtual void OnCountRolling(ulong currentValue, ulong newValue)
+        protected virtual void OnCountRolling(int currentValue, int newValue)
         {
             transformRoll(new TransformComboRoll(), currentValue, newValue);
         }
 
-        protected virtual void OnCountIncrement(ulong currentValue, ulong newValue) {
+        protected virtual void OnCountIncrement(int currentValue, int newValue)
+        {
             DisplayedCount = newValue;
         }
 
-        protected virtual void OnCountChange(ulong currentValue, ulong newValue) {
+        protected virtual void OnCountChange(int currentValue, int newValue)
+        {
             DisplayedCount = newValue;
         }
 
-        private double getProportionalDuration(ulong currentValue, ulong newValue)
+        private double getProportionalDuration(int currentValue, int newValue)
         {
             double difference = currentValue > newValue ? currentValue - newValue : newValue - currentValue;
             return difference * RollingDuration;
         }
 
-        private void updateDisplayedCount(ulong currentValue, ulong newValue, bool rolling)
+        private void updateDisplayedCount(int currentValue, int newValue, bool rolling)
         {
             displayedCount = newValue;
             if (rolling)
@@ -198,10 +166,10 @@ namespace osu.Game.Modes.UI
                 OnDisplayedCountChange(newValue);
         }
 
-        private void updateCount(ulong value, bool rolling = false)
+        private void updateCount(bool rolling)
         {
-            ulong prevCount = count;
-            count = value;
+            int prev = previousValue;
+            previousValue = Current;
 
             if (!IsLoaded)
                 return;
@@ -210,27 +178,27 @@ namespace osu.Game.Modes.UI
             {
                 Flush(false, typeof(TransformComboRoll));
                 IsRolling = false;
-                DisplayedCount = prevCount;
+                DisplayedCount = prev;
 
-                if (prevCount + 1 == count)
-                    OnCountIncrement(prevCount, count);
+                if (prev + 1 == Current)
+                    OnCountIncrement(prev, Current);
                 else
-                    OnCountChange(prevCount, count);
+                    OnCountChange(prev, Current);
             }
             else
             {
-                OnCountRolling(displayedCount, count);
+                OnCountRolling(displayedCount, Current);
                 IsRolling = true;
             }
         }
 
-        private void transformRoll(TransformComboRoll transform, ulong currentValue, ulong newValue)
+        private void transformRoll(TransformComboRoll transform, int currentValue, int newValue)
         {
             Flush(false, typeof(TransformComboRoll));
 
             if (RollingDuration < 1)
             {
-                DisplayedCount = Count;
+                DisplayedCount = Current;
                 return;
             }
 
@@ -243,9 +211,9 @@ namespace osu.Game.Modes.UI
             Transforms.Add(transform);
         }
 
-        protected class TransformComboRoll : Transform<ulong>
+        protected class TransformComboRoll : Transform<int>
         {
-            protected override ulong CurrentValue
+            protected override int CurrentValue
             {
                 get
                 {
@@ -253,23 +221,19 @@ namespace osu.Game.Modes.UI
                     if (time < StartTime) return StartValue;
                     if (time >= EndTime) return EndValue;
 
-                    return (ulong)Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
+                    return (int)Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
                 }
             }
 
             public override void Apply(Drawable d)
             {
                 base.Apply(d);
-                (d as ComboCounter).DisplayedCount = CurrentValue;
+                ((ComboCounter)d).DisplayedCount = CurrentValue;
             }
         }
 
-        public void Set(ulong value)
-        {
-            if (value == 0)
-                Roll();
-            else
-                Count = value;
-        }
+        protected abstract void OnDisplayedCountRolling(int currentValue, int newValue);
+        protected abstract void OnDisplayedCountIncrement(int newValue);
+        protected abstract void OnDisplayedCountChange(int newValue);
     }
 }
diff --git a/osu.Game/Modes/UI/ComboResultCounter.cs b/osu.Game/Modes/UI/ComboResultCounter.cs
index dc624b3660..957a720c94 100644
--- a/osu.Game/Modes/UI/ComboResultCounter.cs
+++ b/osu.Game/Modes/UI/ComboResultCounter.cs
@@ -1,11 +1,11 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics.UserInterface;
+using System;
 
 namespace osu.Game.Modes.UI
 {
@@ -31,7 +31,7 @@ namespace osu.Game.Modes.UI
 
         public override void Increment(ulong amount)
         {
-            Count = Count + amount;
+            Current.Value = Current + amount;
         }
 
         protected class TransformComboResult : Transform<ulong>
@@ -51,7 +51,7 @@ namespace osu.Game.Modes.UI
             public override void Apply(Drawable d)
             {
                 base.Apply(d);
-                (d as ComboResultCounter).DisplayedCount = CurrentValue;
+                ((ComboResultCounter)d).DisplayedCount = CurrentValue;
             }
         }
     }
diff --git a/osu.Game/Modes/UI/HealthDisplay.cs b/osu.Game/Modes/UI/HealthDisplay.cs
index c8d45bac36..3471f4bc3f 100644
--- a/osu.Game/Modes/UI/HealthDisplay.cs
+++ b/osu.Game/Modes/UI/HealthDisplay.cs
@@ -1,72 +1,24 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using osu.Framework.Allocation;
 using osu.Framework.Configuration;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
-using osu.Game.Graphics;
-using OpenTK;
-using OpenTK.Graphics;
 
 namespace osu.Game.Modes.UI
 {
-    public class HealthDisplay : Container
+    public abstract class HealthDisplay : Container
     {
-        private Box background;
-        private Container fill;
-
-        public BindableDouble Current = new BindableDouble()
+        public readonly BindableDouble Current = new BindableDouble
         {
             MinValue = 0,
             MaxValue = 1
         };
 
-        public HealthDisplay()
+        protected HealthDisplay()
         {
-            Children = new Drawable[]
-            {
-                background = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black,
-                },
-                fill = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Scale = new Vector2(0, 1),
-                    Masking = true,
-                    Children = new[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        }
-                    }
-                },
-            };
-
-            Current.ValueChanged += current_ValueChanged;
+            Current.ValueChanged += (s, e) => SetHealth((float)Current);
         }
 
-        [BackgroundDependencyLoader]
-        private void laod(OsuColour colours)
-        {
-            fill.Colour = colours.BlueLighter;
-            fill.EdgeEffect = new EdgeEffect
-            {
-                Colour = colours.BlueDarker.Opacity(0.6f),
-                Radius = 8,
-                Type=  EdgeEffectType.Glow
-            };
-        }
-
-        private void current_ValueChanged(object sender, EventArgs e)
-        {
-            fill.ScaleTo(new Vector2((float)Current, 1), 200, EasingTypes.OutQuint);
-        }
+        protected abstract void SetHealth(float value);
     }
 }
diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index 14d9599be6..e08570522f 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -1,93 +1,106 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using OpenTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Modes.UI
 {
     public abstract class HitRenderer : Container
     {
         public event Action<JudgementInfo> OnJudgement;
-
         public event Action OnAllJudged;
 
+        internal readonly PlayerInputManager InputManager = new PlayerInputManager();
+
+        /// <summary>
+        /// A function to convert coordinates from gamefield to screen space.
+        /// </summary>
+        public abstract Func<Vector2, Vector2> MapPlayfieldToScreenSpace { get; }
+
+        /// <summary>
+        /// Whether all the HitObjects have been judged.
+        /// </summary>
+        protected abstract bool AllObjectsJudged { get; }
+
         protected void TriggerOnJudgement(JudgementInfo j)
         {
             OnJudgement?.Invoke(j);
+
             if (AllObjectsJudged)
                 OnAllJudged?.Invoke();
         }
-
-        protected Playfield Playfield;
-
-        public bool AllObjectsJudged => Playfield.HitObjects.Children.First()?.Judgement.Result != null; //reverse depth sort means First() instead of Last().
-
-        public IEnumerable<DrawableHitObject> DrawableObjects => Playfield.HitObjects.Children;
     }
 
-    public abstract class HitRenderer<T> : HitRenderer
-        where T : HitObject
+    public abstract class HitRenderer<TObject> : HitRenderer
+        where TObject : HitObject
     {
-        private List<T> objects;
+        public override Func<Vector2, Vector2> MapPlayfieldToScreenSpace => Playfield.ScaledContent.ToScreenSpace;
+        public IEnumerable<DrawableHitObject> DrawableObjects => Playfield.HitObjects.Children;
 
-        public Beatmap Beatmap
+        protected override Container<Drawable> Content => content;
+        protected override bool AllObjectsJudged => Playfield.HitObjects.Children.All(h => h.Judgement.Result.HasValue);
+
+        protected Playfield<TObject> Playfield;
+        protected Beatmap<TObject> Beatmap;
+
+        private Container content;
+
+        protected HitRenderer(Beatmap beatmap)
         {
-            set
-            {
-                objects = Convert(value);
-                if (IsLoaded)
-                    loadObjects();
-            }
-        }
+            Beatmap = CreateBeatmapConverter().Convert(beatmap);
 
-        protected abstract Playfield CreatePlayfield();
-
-        protected abstract HitObjectConverter<T> Converter { get; }
-
-        protected virtual List<T> Convert(Beatmap beatmap) => Converter.Convert(beatmap);
-
-        public HitRenderer()
-        {
             RelativeSizeAxes = Axes.Both;
+
+            InputManager.Add(content = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new[]
+                {
+                    Playfield = CreatePlayfield(),
+                }
+            });
+
+            AddInternal(InputManager);
         }
 
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            Children = new Drawable[]
-            {
-                Playfield = CreatePlayfield()
-            };
-
             loadObjects();
         }
 
         private void loadObjects()
         {
-            if (objects == null) return;
-            foreach (T h in objects)
+            foreach (TObject h in Beatmap.HitObjects)
             {
-                var drawableObject = GetVisualRepresentation(h);
+                DrawableHitObject<TObject> drawableObject = GetVisualRepresentation(h);
 
-                if (drawableObject == null) continue;
+                if (drawableObject == null)
+                    continue;
 
                 drawableObject.OnJudgement += onJudgement;
 
                 Playfield.Add(drawableObject);
             }
+
             Playfield.PostProcess();
         }
 
-        private void onJudgement(DrawableHitObject o, JudgementInfo j) => TriggerOnJudgement(j);
+        private void onJudgement(DrawableHitObject<TObject> o, JudgementInfo j) => TriggerOnJudgement(j);
 
-        protected abstract DrawableHitObject GetVisualRepresentation(T h);
+        protected abstract DrawableHitObject<TObject> GetVisualRepresentation(TObject h);
+        protected abstract Playfield<TObject> CreatePlayfield();
+        protected abstract IBeatmapConverter<TObject> CreateBeatmapConverter();
     }
 }
diff --git a/osu.Game/Modes/UI/ScoreOverlay.cs b/osu.Game/Modes/UI/HudOverlay.cs
similarity index 54%
rename from osu.Game/Modes/UI/ScoreOverlay.cs
rename to osu.Game/Modes/UI/HudOverlay.cs
index d9283c52cb..4b454797ce 100644
--- a/osu.Game/Modes/UI/ScoreOverlay.cs
+++ b/osu.Game/Modes/UI/HudOverlay.cs
@@ -1,28 +1,24 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Modes.Objects;
-using OpenTK;
-using osu.Framework.Graphics.Primitives;
-using osu.Game.Screens.Play;
-using osu.Framework.Allocation;
 using osu.Game.Configuration;
-using osu.Framework.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play;
+using System;
 
 namespace osu.Game.Modes.UI
 {
-    public abstract class ScoreOverlay : Container
+    public abstract class HudOverlay : Container
     {
-        public KeyCounterCollection KeyCounter;
-        public ComboCounter ComboCounter;
-        public ScoreCounter ScoreCounter;
-        public PercentageCounter AccuracyCounter;
-        public HealthDisplay HealthDisplay;
-        public Score Score { get; set; }
+        public readonly KeyCounterCollection KeyCounter;
+        public readonly ComboCounter ComboCounter;
+        public readonly ScoreCounter ScoreCounter;
+        public readonly PercentageCounter AccuracyCounter;
+        public readonly HealthDisplay HealthDisplay;
 
         private Bindable<bool> showKeyCounter;
 
@@ -30,31 +26,14 @@ namespace osu.Game.Modes.UI
         protected abstract ComboCounter CreateComboCounter();
         protected abstract PercentageCounter CreateAccuracyCounter();
         protected abstract ScoreCounter CreateScoreCounter();
-        protected virtual HealthDisplay CreateHealthDisplay() => new HealthDisplay
-        {
-            Size = new Vector2(1, 5),
-            RelativeSizeAxes = Axes.X,
-            Margin = new MarginPadding { Top = 20 }
-        };
+        protected abstract HealthDisplay CreateHealthDisplay();
 
-        public virtual void OnHit(HitObject h)
-        {
-            ComboCounter?.Increment();
-            ScoreCounter?.Increment(300);
-            AccuracyCounter?.Set(Math.Min(1, AccuracyCounter.Count + 0.01f));
-        }
-
-        public virtual void OnMiss(HitObject h)
-        {
-            ComboCounter?.Roll();
-            AccuracyCounter?.Set(AccuracyCounter.Count - 0.01f);
-        }
-
-        public ScoreOverlay()
+        protected HudOverlay()
         {
             RelativeSizeAxes = Axes.Both;
 
-            Children = new Drawable[] {
+            Children = new Drawable[]
+            {
                 KeyCounter = CreateKeyCounter(),
                 ComboCounter = CreateComboCounter(),
                 ScoreCounter = CreateScoreCounter(),
@@ -81,11 +60,17 @@ namespace osu.Game.Modes.UI
 
         public void BindProcessor(ScoreProcessor processor)
         {
-            //bind processor bindables to combocounter, score display etc.   
-            processor.TotalScore.ValueChanged += delegate { ScoreCounter?.Set((ulong)processor.TotalScore.Value); };
-            processor.Accuracy.ValueChanged += delegate { AccuracyCounter?.Set((float)processor.Accuracy.Value); };
-            processor.Combo.ValueChanged += delegate { ComboCounter?.Set((ulong)processor.Combo.Value); };
+            //bind processor bindables to combocounter, score display etc.
+            //TODO: these should be bindable binds, not events!
+            ScoreCounter?.Current.BindTo(processor.TotalScore);
+            AccuracyCounter?.Current.BindTo(processor.Accuracy);
+            ComboCounter?.Current.BindTo(processor.Combo);
             HealthDisplay?.Current.BindTo(processor.Health);
         }
+
+        public void BindHitRenderer(HitRenderer hitRenderer)
+        {
+            hitRenderer.InputManager.Add(KeyCounter.GetReceptor());
+        }
     }
 }
diff --git a/osu.Game/Modes/UI/ModIcon.cs b/osu.Game/Modes/UI/ModIcon.cs
new file mode 100644
index 0000000000..b1017a670e
--- /dev/null
+++ b/osu.Game/Modes/UI/ModIcon.cs
@@ -0,0 +1,81 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+
+namespace osu.Game.Modes.UI
+{
+    public class ModIcon : Container
+    {
+        private TextAwesome modIcon, background;
+
+        private float iconSize = 80;
+        public float IconSize
+        {
+            get
+            {
+                return iconSize;
+            }
+            set
+            {
+                iconSize = value;
+                reapplySize();
+            }
+        }
+        
+        public new Color4 Colour
+        {
+            get
+            {
+                return background.Colour;
+            }
+            set
+            {
+                background.Colour = value;
+            }
+        }
+        
+        public FontAwesome Icon
+        {
+            get
+            {
+                return modIcon.Icon;
+            }
+            set
+            {
+                modIcon.Icon = value;
+            }
+        }
+
+        private void reapplySize()
+        {
+            background.TextSize = iconSize;
+            modIcon.TextSize = iconSize - 35;
+        }
+
+        public ModIcon()
+        {
+            Children = new Drawable[]
+            {
+                background = new TextAwesome
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Icon = FontAwesome.fa_osu_mod_bg,
+                    Shadow = true,
+                },
+                modIcon = new TextAwesome
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Colour = OsuColour.Gray(84),
+                },
+            };
+
+            reapplySize();
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Modes/UI/Playfield.cs b/osu.Game/Modes/UI/Playfield.cs
index 91eddce73c..0cc7b0468e 100644
--- a/osu.Game/Modes/UI/Playfield.cs
+++ b/osu.Game/Modes/UI/Playfield.cs
@@ -1,32 +1,49 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
+using OpenTK;
 
 namespace osu.Game.Modes.UI
 {
-    public abstract class Playfield : Container
+    public abstract class Playfield<T> : Container
+        where T : HitObject
     {
-        public HitObjectContainer HitObjects;
-        private Container<Drawable> content;
+        public HitObjectContainer<DrawableHitObject<T>> HitObjects;
 
-        public virtual void Add(DrawableHitObject h) => HitObjects.Add(h);
+        public virtual void Add(DrawableHitObject<T> h) => HitObjects.Add(h);
+
+        internal Container<Drawable> ScaledContent;
 
         public override bool Contains(Vector2 screenSpacePos) => true;
 
         protected override Container<Drawable> Content => content;
 
-        public Playfield()
+        private Container<Drawable> content;
+
+        /// <summary>
+        /// A container for keeping track of DrawableHitObjects.
+        /// </summary>
+        /// <param name="customWidth">Whether we want our internal coordinate system to be scaled to a specified width.</param>
+        protected Playfield(float? customWidth = null)
         {
-            AddInternal(content = new ScaledContainer()
+            AddInternal(ScaledContent = new ScaledContainer
             {
+                CustomWidth = customWidth,
                 RelativeSizeAxes = Axes.Both,
+                Children = new[]
+                {
+                    content = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    }
+                }
             });
 
-            Add(HitObjects = new HitObjectContainer
+            Add(HitObjects = new HitObjectContainer<DrawableHitObject<T>>
             {
                 RelativeSizeAxes = Axes.Both,
             });
@@ -36,14 +53,20 @@ namespace osu.Game.Modes.UI
         {
         }
 
-        public class ScaledContainer : Container
+        private class ScaledContainer : Container
         {
-            protected override Vector2 DrawScale => new Vector2(DrawSize.X / 512);
+            /// <summary>
+            /// A value (in game pixels that we should scale our content to match).
+            /// </summary>
+            public float? CustomWidth;
+
+            //dividing by the customwidth will effectively scale our content to the required container size.
+            protected override Vector2 DrawScale => CustomWidth.HasValue ? new Vector2(DrawSize.X / CustomWidth.Value) : base.DrawScale;
 
             public override bool Contains(Vector2 screenSpacePos) => true;
         }
 
-        public class HitObjectContainer : Container<DrawableHitObject>
+        public class HitObjectContainer<U> : Container<U> where U : Drawable
         {
             public override bool Contains(Vector2 screenSpacePos) => true;
         }
diff --git a/osu.Game.Modes.Osu/UI/OsuComboCounter.cs b/osu.Game/Modes/UI/StandardComboCounter.cs
similarity index 74%
rename from osu.Game.Modes.Osu/UI/OsuComboCounter.cs
rename to osu.Game/Modes/UI/StandardComboCounter.cs
index 5ba5537b59..08bb3add84 100644
--- a/osu.Game.Modes.Osu/UI/OsuComboCounter.cs
+++ b/osu.Game/Modes/UI/StandardComboCounter.cs
@@ -1,17 +1,16 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Modes.UI;
 using OpenTK;
 
-namespace osu.Game.Modes.Osu.UI
+namespace osu.Game.Modes.UI
 {
     /// <summary>
-    /// Uses the 'x' symbol and has a pop-out effect while rolling over. Used in osu! standard.
+    /// Uses the 'x' symbol and has a pop-out effect while rolling over.
     /// </summary>
-    public class OsuComboCounter : ComboCounter
+    public class StandardComboCounter : ComboCounter
     {
-        protected uint ScheduledPopOutCurrentId = 0;
+        protected uint ScheduledPopOutCurrentId;
 
         protected virtual float PopOutSmallScale => 1.1f;
         protected virtual bool CanPopOutWhileRolling => false;
@@ -26,12 +25,12 @@ namespace osu.Game.Modes.Osu.UI
             PopOutCount.Anchor = Anchor;
         }
 
-        protected override string FormatCount(ulong count)
+        protected override string FormatCount(int count)
         {
             return $@"{count}x";
         }
 
-        protected virtual void TransformPopOut(ulong newValue)
+        protected virtual void TransformPopOut(int newValue)
         {
             PopOutCount.Text = FormatCount(newValue);
 
@@ -44,19 +43,19 @@ namespace osu.Game.Modes.Osu.UI
             PopOutCount.MoveTo(DisplayedCountSpriteText.Position, PopOutDuration, PopOutEasing);
         }
 
-        protected virtual void TransformPopOutRolling(ulong newValue)
+        protected virtual void TransformPopOutRolling(int newValue)
         {
             TransformPopOut(newValue);
             TransformPopOutSmall(newValue);
         }
 
-        protected virtual void TransformNoPopOut(ulong newValue)
+        protected virtual void TransformNoPopOut(int newValue)
         {
             DisplayedCountSpriteText.Text = FormatCount(newValue);
             DisplayedCountSpriteText.ScaleTo(1);
         }
 
-        protected virtual void TransformPopOutSmall(ulong newValue)
+        protected virtual void TransformPopOutSmall(int newValue)
         {
             DisplayedCountSpriteText.Text = FormatCount(newValue);
             DisplayedCountSpriteText.ScaleTo(PopOutSmallScale);
@@ -72,7 +71,7 @@ namespace osu.Game.Modes.Osu.UI
             DisplayedCount++;
         }
 
-        protected override void OnCountRolling(ulong currentValue, ulong newValue)
+        protected override void OnCountRolling(int currentValue, int newValue)
         {
             ScheduledPopOutCurrentId++;
 
@@ -83,7 +82,7 @@ namespace osu.Game.Modes.Osu.UI
             base.OnCountRolling(currentValue, newValue);
         }
 
-        protected override void OnCountIncrement(ulong currentValue, ulong newValue)
+        protected override void OnCountIncrement(int currentValue, int newValue)
         {
             ScheduledPopOutCurrentId++;
 
@@ -93,7 +92,7 @@ namespace osu.Game.Modes.Osu.UI
             DisplayedCountSpriteText.Show();
 
             TransformPopOut(newValue);
-            
+
             uint newTaskId = ScheduledPopOutCurrentId;
             Scheduler.AddDelayed(delegate
             {
@@ -101,7 +100,7 @@ namespace osu.Game.Modes.Osu.UI
             }, PopOutDuration);
         }
 
-        protected override void OnCountChange(ulong currentValue, ulong newValue)
+        protected override void OnCountChange(int currentValue, int newValue)
         {
             ScheduledPopOutCurrentId++;
 
@@ -111,7 +110,7 @@ namespace osu.Game.Modes.Osu.UI
             base.OnCountChange(currentValue, newValue);
         }
 
-        protected override void OnDisplayedCountRolling(ulong currentValue, ulong newValue)
+        protected override void OnDisplayedCountRolling(int currentValue, int newValue)
         {
             if (newValue == 0)
                 DisplayedCountSpriteText.FadeOut(FadeOutDuration);
@@ -124,14 +123,14 @@ namespace osu.Game.Modes.Osu.UI
                 TransformNoPopOut(newValue);
         }
 
-        protected override void OnDisplayedCountChange(ulong newValue)
+        protected override void OnDisplayedCountChange(int newValue)
         {
             DisplayedCountSpriteText.FadeTo(newValue == 0 ? 0 : 1);
 
             TransformNoPopOut(newValue);
         }
 
-        protected override void OnDisplayedCountIncrement(ulong newValue)
+        protected override void OnDisplayedCountIncrement(int newValue)
         {
             DisplayedCountSpriteText.Show();
 
diff --git a/osu.Game/Modes/UI/StandardHealthDisplay.cs b/osu.Game/Modes/UI/StandardHealthDisplay.cs
new file mode 100644
index 0000000000..b6a3dc7f89
--- /dev/null
+++ b/osu.Game/Modes/UI/StandardHealthDisplay.cs
@@ -0,0 +1,60 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
+using osu.Game.Graphics;
+
+namespace osu.Game.Modes.UI
+{
+    public class StandardHealthDisplay : HealthDisplay
+    {
+        private Container fill;
+
+        public StandardHealthDisplay()
+        {
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                fill = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Scale = new Vector2(0, 1),
+                    Masking = true,
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        }
+                    }
+                },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            fill.Colour = colours.BlueLighter;
+            fill.EdgeEffect = new EdgeEffect
+            {
+                Colour = colours.BlueDarker.Opacity(0.6f),
+                Radius = 8,
+                Type = EdgeEffectType.Glow
+            };
+        }
+
+        protected override void SetHealth(float value) => fill.ScaleTo(new Vector2(value, 1), 200, EasingTypes.OutQuint);
+    }
+}
diff --git a/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs b/osu.Game/Modes/UI/StandardHudOverlay.cs
similarity index 72%
rename from osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs
rename to osu.Game/Modes/UI/StandardHudOverlay.cs
index c7791ab8b4..f77191adf7 100644
--- a/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs
+++ b/osu.Game/Modes/UI/StandardHudOverlay.cs
@@ -1,28 +1,17 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Modes.UI;
 using OpenTK;
-using OpenTK.Input;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play;
 
-namespace osu.Game.Modes.Osu.UI
+namespace osu.Game.Modes.UI
 {
-    public class OsuScoreOverlay : ScoreOverlay
+    public class StandardHudOverlay : HudOverlay
     {
-        protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6)
-        {
-            Anchor = Anchor.TopCentre,
-            Origin = Anchor.TopCentre,
-            TextSize = 40,
-            Position = new Vector2(0, 30),
-            Margin = new MarginPadding { Right = 5 },
-        };
-
-        protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter()
+        protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter
         {
             Anchor = Anchor.TopCentre,
             Origin = Anchor.TopCentre,
@@ -31,12 +20,19 @@ namespace osu.Game.Modes.Osu.UI
             Margin = new MarginPadding { Right = 5 },
         };
 
-        protected override ComboCounter CreateComboCounter() => new OsuComboCounter()
+        protected override ComboCounter CreateComboCounter() => new StandardComboCounter
         {
             Anchor = Anchor.BottomLeft,
             Origin = Anchor.BottomLeft,
         };
 
+        protected override HealthDisplay CreateHealthDisplay() => new StandardHealthDisplay
+        {
+            Size = new Vector2(1, 5),
+            RelativeSizeAxes = Axes.X,
+            Margin = new MarginPadding { Top = 20 }
+        };
+
         protected override KeyCounterCollection CreateKeyCounter() => new KeyCounterCollection
         {
             IsCounting = true,
@@ -44,13 +40,15 @@ namespace osu.Game.Modes.Osu.UI
             Anchor = Anchor.BottomRight,
             Origin = Anchor.BottomRight,
             Margin = new MarginPadding(10),
-            Children = new KeyCounter[]
-            {
-                new KeyCounterKeyboard(@"Z", Key.Z),
-                new KeyCounterKeyboard(@"X", Key.X),
-                new KeyCounterMouse(@"M1", MouseButton.Left),
-                new KeyCounterMouse(@"M2", MouseButton.Right),
-            }
+        };
+
+        protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6)
+        {
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.TopCentre,
+            TextSize = 40,
+            Position = new Vector2(0, 30),
+            Margin = new MarginPadding { Right = 5 },
         };
     }
 }
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index a9e0b2163b..6bb61ca83c 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -20,10 +20,10 @@ namespace osu.Game.Online.API
         private OAuth authentication;
 
         public string Endpoint = @"https://new.ppy.sh";
-        const string client_id = @"5";
-        const string client_secret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
+        private const string client_id = @"5";
+        private const string client_secret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
 
-        ConcurrentQueue<APIRequest> queue = new ConcurrentQueue<APIRequest>();
+        private ConcurrentQueue<APIRequest> queue = new ConcurrentQueue<APIRequest>();
 
         public Scheduler Scheduler = new Scheduler();
 
@@ -38,22 +38,15 @@ namespace osu.Game.Online.API
         public string Token
         {
             get { return authentication.Token?.ToString(); }
-
-            set
-            {
-
-                if (string.IsNullOrEmpty(value))
-                    authentication.Token = null;
-                else
-                    authentication.Token = OAuthToken.Parse(value);
-            }
+            set { authentication.Token = string.IsNullOrEmpty(value) ? null : OAuthToken.Parse(value); }
         }
 
-        protected bool HasLogin => Token != null || (!string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(Password));
+        protected bool HasLogin => Token != null || !string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(Password);
 
+        // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable (should dispose of this or at very least keep a reference).
         private Thread thread;
 
-        Logger log;
+        private Logger log;
 
         public APIAccess()
         {
@@ -88,22 +81,22 @@ namespace osu.Game.Online.API
         /// <summary>
         /// Number of consecutive requests which failed due to network issues.
         /// </summary>
-        int failureCount = 0;
+        private int failureCount;
 
         private void run()
         {
-            while (true)
+            while (thread.IsAlive)
             {
                 switch (State)
                 {
                     case APIState.Failing:
                         //todo: replace this with a ping request.
-                        log.Add($@"In a failing state, waiting a bit before we try again...");
+                        log.Add(@"In a failing state, waiting a bit before we try again...");
                         Thread.Sleep(5000);
                         if (queue.Count == 0)
                         {
-                            log.Add($@"Queueing a ping request");
-                            Queue(new ListChannelsRequest() { Timeout = 5000 });
+                            log.Add(@"Queueing a ping request");
+                            Queue(new ListChannelsRequest { Timeout = 5000 });
                         }
                         break;
                     case APIState.Offline:
@@ -131,7 +124,7 @@ namespace osu.Game.Online.API
 
 
                         var userReq = new GetUserRequest();
-                        userReq.Success += (u) => {
+                        userReq.Success += u => {
                             LocalUser.Value = u;
                             //we're connected!
                             State = APIState.Online;
@@ -291,7 +284,7 @@ namespace osu.Game.Online.API
             if (failOldRequests)
             {
                 APIRequest req;
-                while (queue.TryDequeue(out req))
+                while (oldQueue.TryDequeue(out req))
                     req.Fail(new Exception(@"Disconnected from server"));
             }
         }
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 7b5f488c17..f871e5e20a 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Online.API
 
         private void onSuccess()
         {
-            Success?.Invoke((WebRequest as JsonWebRequest<T>).ResponseObject);
+            Success?.Invoke(((JsonWebRequest<T>)WebRequest).ResponseObject);
         }
 
         public new event APISuccessHandler<T> Success;
@@ -89,5 +89,5 @@ namespace osu.Game.Online.API
 
     public delegate void APIFailureHandler(Exception e);
     public delegate void APISuccessHandler();
-    public delegate void APISuccessHandler<T>(T content);
+    public delegate void APISuccessHandler<in T>(T content);
 }
diff --git a/osu.Game/Online/API/OAuthToken.cs b/osu.Game/Online/API/OAuthToken.cs
index c33701715e..4085e5602a 100644
--- a/osu.Game/Online/API/OAuthToken.cs
+++ b/osu.Game/Online/API/OAuthToken.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Online.API
             try
             {
                 string[] parts = value.Split('/');
-                return new OAuthToken()
+                return new OAuthToken
                 {
                     AccessToken = parts[0],
                     AccessTokenExpiry = long.Parse(parts[1], NumberFormatInfo.InvariantInfo),
diff --git a/osu.Game/Online/API/Requests/GetMessagesRequest.cs b/osu.Game/Online/API/Requests/GetMessagesRequest.cs
index ab309b2bfa..af5a96a66a 100644
--- a/osu.Game/Online/API/Requests/GetMessagesRequest.cs
+++ b/osu.Game/Online/API/Requests/GetMessagesRequest.cs
@@ -9,8 +9,8 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetMessagesRequest : APIRequest<List<Message>>
     {
-        List<Channel> channels;
-        long? since;
+        private List<Channel> channels;
+        private long? since;
 
         public GetMessagesRequest(List<Channel> channels, long? sinceId)
         {
diff --git a/osu.Game/Online/API/SecurePassword.cs b/osu.Game/Online/API/SecurePassword.cs
deleted file mode 100644
index e3e46ba6dc..0000000000
--- a/osu.Game/Online/API/SecurePassword.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.Diagnostics;
-using System.Security;
-using osu.Framework.Extensions;
-
-namespace osu.Game.Online.API
-{
-    internal class SecurePassword
-    {
-        private readonly SecureString storage = new SecureString();
-        private readonly Representation representation;
-
-        //todo: move this to a central constants file.
-        private const string password_entropy = @"cu24180ncjeiu0ci1nwui";
-
-        public SecurePassword(string input, bool encrypted = false)
-        {
-            //if (encrypted)
-            //{
-            //    string rep;
-            //    input = DPAPI.Decrypt(input, password_entropy, out rep);
-            //    Enum.TryParse(rep, out representation);
-            //}
-            //else
-            {
-                representation = Representation.Raw;
-            }
-
-            foreach (char c in input)
-                storage.AppendChar(c);
-            storage.MakeReadOnly();
-        }
-
-        internal string Get(Representation request = Representation.Raw)
-        {
-            Debug.Assert(representation == request);
-
-            switch (request)
-            {
-                default:
-                    return storage.UnsecureRepresentation();
-                //case Representation.Encrypted:
-                //    return DPAPI.Encrypt(DPAPI.KeyType.UserKey, storage.UnsecureRepresentation(), password_entropy, representation.ToString());
-            }
-        }
-    }
-
-    enum Representation
-    {
-        Raw,
-        Encrypted
-    }
-}
diff --git a/osu.Game/Online/Chat/Drawables/ChatLine.cs b/osu.Game/Online/Chat/Drawables/ChatLine.cs
index c55dcc6620..9f78be92d1 100644
--- a/osu.Game/Online/Chat/Drawables/ChatLine.cs
+++ b/osu.Game/Online/Chat/Drawables/ChatLine.cs
@@ -59,8 +59,8 @@ namespace osu.Game.Online.Chat.Drawables
             return username_colours[message.UserId % username_colours.Length];
         }
 
-        const float padding = 200;
-        const float text_size = 20;
+        private const float padding = 200;
+        private const float text_size = 20;
 
         public ChatLine(Message message)
         {
diff --git a/osu.Game/Online/Chat/Drawables/DrawableChannel.cs b/osu.Game/Online/Chat/Drawables/DrawableChannel.cs
index b8eb1e466a..eb8653976a 100644
--- a/osu.Game/Online/Chat/Drawables/DrawableChannel.cs
+++ b/osu.Game/Online/Chat/Drawables/DrawableChannel.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
-using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Online.Chat.Drawables
@@ -41,7 +40,7 @@ namespace osu.Game.Online.Chat.Drawables
                     {
                         flow = new FillFlowContainer
                         {
-                            Direction = FillDirection.Down,
+                            Direction = FillDirection.Vertical,
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Padding = new MarginPadding { Left = 20, Right = 20 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 9f7e3e04dc..79ffcfcadf 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -13,7 +13,6 @@ using osu.Game.Input;
 using OpenTK.Input;
 using osu.Framework.Logging;
 using osu.Game.Graphics.UserInterface.Volume;
-using osu.Game.Database;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Timing;
@@ -24,16 +23,16 @@ using osu.Game.Screens.Menu;
 using OpenTK;
 using System.Linq;
 using osu.Framework.Graphics.Primitives;
-using System.Collections.Generic;
 using System.Threading.Tasks;
+using osu.Framework.Threading;
+using osu.Game.Graphics;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Screens.Play;
 
 namespace osu.Game
 {
     public class OsuGame : OsuGameBase
     {
-        public virtual bool IsDeployedBuild => false;
-
         public Toolbar Toolbar;
 
         private ChatOverlay chat;
@@ -61,7 +60,7 @@ namespace osu.Game
 
         public Bindable<PlayMode> PlayMode;
 
-        string[] args;
+        private string[] args;
 
         private OptionsOverlay options;
 
@@ -84,7 +83,7 @@ namespace osu.Game
             if (args?.Length > 0)
             {
                 var paths = args.Where(a => !a.StartsWith(@"-"));
-                ImportBeatmapsAsync(paths);
+                Task.Run(() => BeatmapDatabase.Import(paths));
             }
 
             Dependencies.Cache(this);
@@ -92,9 +91,41 @@ namespace osu.Game
             PlayMode = LocalConfig.GetBindable<PlayMode>(OsuConfig.PlayMode);
         }
 
-        protected async void ImportBeatmapsAsync(IEnumerable<string> paths)
+        private ScheduledDelegate scoreLoad;
+
+        protected void LoadScore(Score s)
         {
-            await Task.Run(() => BeatmapDatabase.Import(paths));
+            scoreLoad?.Cancel();
+
+            var menu = intro.ChildScreen;
+
+            if (menu == null)
+            {
+                scoreLoad = Schedule(() => LoadScore(s));
+                return;
+            }
+
+            if (!menu.IsCurrentScreen)
+            {
+                menu.MakeCurrent();
+                Delay(500);
+                scoreLoad = Schedule(() => LoadScore(s));
+                return;
+            }
+
+            if (s.Beatmap == null)
+            {
+                notificationManager.Post(new SimpleNotification
+                {
+                    Text = @"Tried to load a score for a beatmap we don't have!",
+                    Icon = FontAwesome.fa_life_saver,
+                });
+                return;
+            }
+
+            Beatmap.Value = BeatmapDatabase.GetWorkingBeatmap(s.Beatmap);
+
+            menu.Push(new PlayerLoader(new Player { ReplayInputHandler = s.Replay.GetInputHandler() }));
         }
 
         protected override void LoadComplete()
@@ -129,7 +160,7 @@ namespace osu.Game
             //overlay elements
             (chat = new ChatOverlay { Depth = 0 }).LoadAsync(this, overlayContent.Add);
             (options = new OptionsOverlay { Depth = -1 }).LoadAsync(this, overlayContent.Add);
-            (musicController = new MusicController()
+            (musicController = new MusicController
             {
                 Depth = -2,
                 Position = new Vector2(0, Toolbar.HEIGHT),
@@ -194,7 +225,7 @@ namespace osu.Game
 
         private bool globalHotkeyPressed(InputState state, KeyDownEventArgs args)
         {
-            if (args.Repeat) return false;
+            if (args.Repeat || intro == null) return false;
 
             switch (args.Key)
             {
@@ -203,9 +234,11 @@ namespace osu.Game
                     return true;
                 case Key.PageUp:
                 case Key.PageDown:
-                    var rate = ((Clock as ThrottledFrameClock).Source as StopwatchClock).Rate * (args.Key == Key.PageUp ? 1.1f : 0.9f);
-                    ((Clock as ThrottledFrameClock).Source as StopwatchClock).Rate = rate;
-                    Logger.Log($@"Adjusting game clock to {rate}", LoggingTarget.Debug);
+                    var swClock = (Clock as ThrottledFrameClock)?.Source as StopwatchClock;
+                    if (swClock == null) return false;
+
+                    swClock.Rate *= args.Key == Key.PageUp ? 1.1f : 0.9f;
+                    Logger.Log($@"Adjusting game clock to {swClock.Rate}", LoggingTarget.Debug);
                     return true;
             }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 1c34743567..50c8aab5ef 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -1,6 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
+using System.Diagnostics;
+using System.Reflection;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
@@ -25,6 +28,8 @@ namespace osu.Game
 
         protected BeatmapDatabase BeatmapDatabase;
 
+        protected ScoreDatabase ScoreDatabase;
+
         protected override string MainResourceFile => @"osu.Game.Resources.dll";
 
         public APIAccess API;
@@ -33,16 +38,51 @@ namespace osu.Game
 
         private RatioAdjust ratioContainer;
 
-        public CursorContainer Cursor;
+        protected CursorContainer Cursor;
 
         public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
+        protected AssemblyName AssemblyName => Assembly.GetEntryAssembly()?.GetName() ?? new AssemblyName { Version = new Version() };
+
+        public bool IsDeployedBuild => AssemblyName.Version.Major > 0;
+
+        public bool IsDebug
+        {
+            get
+            {
+                // ReSharper disable once RedundantAssignment
+                bool isDebug = false;
+                // Debug.Assert conditions are only evaluated in debug mode
+                Debug.Assert(isDebug = true);
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                return isDebug;
+            }
+        }
+
+        public string Version
+        {
+            get
+            {
+                if (!IsDeployedBuild)
+                    return @"local " + (IsDebug ? @"debug" : @"release");
+
+                var assembly = AssemblyName;
+                return $@"{assembly.Version.Major}.{assembly.Version.Minor}.{assembly.Version.Build}";
+            }
+        }
+
+        public OsuGameBase()
+        {
+            Name = @"osu!lazer";
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
             Dependencies.Cache(this);
             Dependencies.Cache(LocalConfig);
             Dependencies.Cache(BeatmapDatabase = new BeatmapDatabase(Host.Storage, Host));
+            Dependencies.Cache(ScoreDatabase = new ScoreDatabase(Host.Storage, Host, BeatmapDatabase));
             Dependencies.Cache(new OsuColour());
 
             //this completely overrides the framework default. will need to change once we make a proper FontStore.
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index ab5a255897..efd366adb1 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays
 {
     public class ChatOverlay : FocusedOverlayContainer, IOnlineComponent
     {
-        const float textbox_height = 40;
+        private const float textbox_height = 40;
 
         private ScheduledDelegate messageRequest;
 
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 5256a90bf1..908dbf8ebc 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -11,6 +12,7 @@ using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
+using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
@@ -172,7 +174,7 @@ namespace osu.Game.Overlays.Dialog
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Position = new Vector2(0f, -50f),
-                            Direction = FillDirection.Down,
+                            Direction = FillDirection.Vertical,
                             Spacing = new Vector2(0f, 10f),
                             Children = new Drawable[]
                             {
@@ -211,7 +213,7 @@ namespace osu.Game.Overlays.Dialog
                                         },
                                     },
                                 },
-                                header = new SpriteText
+                                header = new OsuSpriteText
                                 {
                                     Origin = Anchor.TopCentre,
                                     Anchor = Anchor.TopCentre,
@@ -219,7 +221,7 @@ namespace osu.Game.Overlays.Dialog
                                     TextSize = 25,
                                     Shadow = true,
                                 },
-                                body = new SpriteText
+                                body = new OsuSpriteText
                                 {
                                     Origin = Anchor.TopCentre,
                                     Anchor = Anchor.TopCentre,
@@ -235,7 +237,7 @@ namespace osu.Game.Overlays.Dialog
                             Origin = Anchor.TopCentre,
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Down,
+                            Direction = FillDirection.Vertical,
                         },
                     },
                 },
diff --git a/osu.Game/Overlays/Dialog/PopupDialogButton.cs b/osu.Game/Overlays/Dialog/PopupDialogButton.cs
index fe86423d8f..5818061402 100644
--- a/osu.Game/Overlays/Dialog/PopupDialogButton.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialogButton.cs
@@ -1,8 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 95f08e9e24..12cca5275a 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -1,11 +1,11 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
-using osu.Game.Graphics;
 using osu.Game.Overlays.Dialog;
 using OpenTK.Graphics;
 
diff --git a/osu.Game/Overlays/DragBar.cs b/osu.Game/Overlays/DragBar.cs
index 7315cf38d1..2e8eb272d8 100644
--- a/osu.Game/Overlays/DragBar.cs
+++ b/osu.Game/Overlays/DragBar.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays
 
             Children = new Drawable[]
             {
-                fill = new Box()
+                fill = new Box
                 {
                     Origin = Anchor.CentreLeft,
                     Anchor = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/LoginOverlay.cs b/osu.Game/Overlays/LoginOverlay.cs
index e1b72f4ed9..fec1c5ec6e 100644
--- a/osu.Game/Overlays/LoginOverlay.cs
+++ b/osu.Game/Overlays/LoginOverlay.cs
@@ -13,11 +13,11 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    class LoginOverlay : FocusedOverlayContainer
+    internal class LoginOverlay : FocusedOverlayContainer
     {
         private LoginOptions optionsSection;
 
-        const float transition_time = 400;
+        private const float transition_time = 400;
 
         public LoginOverlay()
         {
diff --git a/osu.Game/Overlays/Mods/AssistedSection.cs b/osu.Game/Overlays/Mods/AssistedSection.cs
new file mode 100644
index 0000000000..0bb1bc9dff
--- /dev/null
+++ b/osu.Game/Overlays/Mods/AssistedSection.cs
@@ -0,0 +1,28 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK.Input;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Modes;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class AssistedSection : ModSection
+    {
+        protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
+        public override ModType ModType => ModType.Special;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            ButtonColour = colours.Blue;
+            SelectedColour = colours.BlueLight;
+        }
+
+        public AssistedSection()
+        {
+            Header = @"Assisted";
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs
new file mode 100644
index 0000000000..4dfb0ba6c2
--- /dev/null
+++ b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs
@@ -0,0 +1,28 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK.Input;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Modes;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class DifficultyIncreaseSection : ModSection
+    {
+        protected override Key[] ToggleKeys => new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
+        public override ModType ModType => ModType.DifficultyIncrease;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            ButtonColour = colours.Yellow;
+            SelectedColour = colours.YellowLight;
+        }
+
+        public DifficultyIncreaseSection()
+        {
+            Header = @"Gameplay Difficulty Increase";
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs
new file mode 100644
index 0000000000..d92fb541c3
--- /dev/null
+++ b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs
@@ -0,0 +1,28 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK.Input;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Modes;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class DifficultyReductionSection : ModSection
+    {
+        protected override Key[] ToggleKeys => new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
+        public override ModType ModType => ModType.DifficultyReduction;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            ButtonColour = colours.Green;
+            SelectedColour = colours.GreenLight;
+        }
+
+        public DifficultyReductionSection()
+        {
+            Header = @"Gameplay Difficulty Reduction";
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
new file mode 100644
index 0000000000..6e3bafbada
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -0,0 +1,256 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Input;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
+using osu.Framework.Input;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Modes;
+using osu.Game.Modes.UI;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class ModButton : FillFlowContainer
+    {
+        private ModIcon foregroundIcon { get; set; }
+        private SpriteText text;
+        private Container<ModIcon> iconsContainer;
+        private SampleChannel sampleOn, sampleOff;
+
+        public Action<Mod> Action; // Passed the selected mod or null if none
+
+        private int _selectedIndex = -1;
+        private int selectedIndex
+        {
+            get
+            {
+                return _selectedIndex;
+            }
+            set
+            {
+                if (value == _selectedIndex) return;
+                _selectedIndex = value;
+
+                if (value >= Mods.Length)
+                {
+                    _selectedIndex = -1;
+                }
+                else if (value <= -2)
+                {
+                    _selectedIndex = Mods.Length - 1;
+                }
+
+                iconsContainer.RotateTo(Selected ? 5f : 0f, 300, EasingTypes.OutElastic);
+                iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, EasingTypes.OutElastic);
+                foregroundIcon.Colour = Selected ? SelectedColour : ButtonColour;
+
+                if (mod != null)
+                    displayMod(SelectedMod ?? Mods[0]);
+            }
+        }
+
+        public bool Selected => selectedIndex != -1;
+
+        private Color4 buttonColour;
+        public Color4 ButtonColour
+        {
+            get
+            {
+                return buttonColour;
+            }
+            set
+            {
+                if (value == buttonColour) return;
+                buttonColour = value;
+                foreach (ModIcon icon in iconsContainer.Children)
+                {
+                    icon.Colour = value;
+                }
+            }
+        }
+
+        private Color4 selectedColour;
+        public Color4 SelectedColour
+        {
+            get
+            {
+                return selectedColour;
+            }
+            set
+            {
+                if (value == selectedColour) return;
+                selectedColour = value;
+                if (Selected) foregroundIcon.Colour = value;
+            }
+        }
+
+        private Mod mod;
+        public Mod Mod
+        {
+            get
+            {
+                return mod;
+            }
+            set
+            {
+                mod = value;
+
+                if (mod == null)
+                {
+                    Mods = new Mod[0];
+                    Alpha = 0;
+                }
+                else
+                {
+                    Mods = (mod as MultiMod)?.Mods ?? new[] { mod };
+                    Alpha = 1;
+                }
+
+                createIcons();
+                if (Mods.Length > 0)
+                {
+                    displayMod(Mods[0]);
+                }
+            }
+        }
+
+        public Mod[] Mods { get; private set; }
+
+        // the mods from Mod, only multiple if Mod is a MultiMod
+
+        public Mod SelectedMod => Mods.ElementAtOrDefault(selectedIndex);
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            sampleOn = audio.Sample.Get(@"Checkbox/check-on");
+            sampleOff = audio.Sample.Get(@"Checkbox/check-off");
+        }
+
+        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+        {
+            switch (args.Button)
+            {
+                case MouseButton.Left:
+                    SelectNext();
+                    break;
+                case MouseButton.Right:
+                    SelectPrevious();
+                    break;
+            }
+            return true;
+        }
+
+        public void SelectNext()
+        {
+            (++selectedIndex == -1 ? sampleOff : sampleOn).Play();
+            Action?.Invoke(SelectedMod);
+        }
+
+        public void SelectPrevious()
+        {
+            (--selectedIndex == -1 ? sampleOff : sampleOn).Play();
+            Action?.Invoke(SelectedMod);
+        }
+
+        public void Deselect()
+        {
+            selectedIndex = -1;
+        }
+
+        private void displayMod(Mod mod)
+        {
+            foregroundIcon.Icon = mod.Icon;
+            text.Text = mod.Name;
+        }
+
+        private void createIcons()
+        {
+            iconsContainer.Clear();
+            if (Mods.Length > 1)
+            {
+                iconsContainer.Add(new[]
+                {
+                    new ModIcon
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        AutoSizeAxes = Axes.Both,
+                        Position = new Vector2(1.5f),
+                        Colour = ButtonColour
+                    },
+                    foregroundIcon = new ModIcon
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        AutoSizeAxes = Axes.Both,
+                        Position = new Vector2(-1.5f),
+                        Colour = ButtonColour
+                    },
+                });
+            }
+            else
+            {
+                iconsContainer.Add(foregroundIcon = new ModIcon
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    AutoSizeAxes = Axes.Both,
+                    Colour = ButtonColour
+                });
+            }
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            foreach (ModIcon icon in iconsContainer.Children)
+                icon.Colour = ButtonColour;
+        }
+
+        public ModButton(Mod m)
+        {
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(0f, -5f);
+            Size = new Vector2(100f);
+            AlwaysPresent = true;
+
+            Children = new Drawable[]
+            {
+                new Container
+                {
+                    Size = new Vector2(77f, 80f),
+                    Origin = Anchor.TopCentre,
+                    Anchor = Anchor.TopCentre,
+                    Children = new Drawable[]
+                    {
+                        iconsContainer = new Container<ModIcon>
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                        }
+                    }
+                },
+                text = new OsuSpriteText
+                {
+                    Origin = Anchor.TopCentre,
+                    Anchor = Anchor.TopCentre,
+                    TextSize = 18,
+                },
+            };
+
+            Mod = m;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
new file mode 100644
index 0000000000..c07114919e
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -0,0 +1,145 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Input;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Input;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Modes;
+
+namespace osu.Game.Overlays.Mods
+{
+    public abstract class ModSection : Container
+    {
+        private OsuSpriteText headerLabel;
+
+        public FillFlowContainer<ModButton> ButtonsContainer { get; }
+
+        public Action<Mod> Action;
+        protected abstract Key[] ToggleKeys { get; }
+        public abstract ModType ModType { get; }
+
+        public string Header
+        {
+            get
+            {
+                return headerLabel.Text;
+            }
+            set
+            {
+                headerLabel.Text = value;
+            }
+        }
+
+        private ModButton[] buttons = { };
+        public ModButton[] Buttons
+        {
+            get
+            {
+                return buttons;
+            }
+            set
+            {
+                if (value == buttons) return;
+                buttons = value;
+
+                foreach (ModButton button in value)
+                {
+                    button.ButtonColour = ButtonColour;
+                    button.SelectedColour = selectedColour;
+                    button.Action = Action;
+                }
+
+                ButtonsContainer.Children = value;
+            }
+        }
+
+        private Color4 buttonsBolour = Color4.White;
+        public Color4 ButtonColour
+        {
+            get
+            {
+                return buttonsBolour;
+            }
+            set
+            {
+                if (value == buttonsBolour) return;
+                buttonsBolour = value;
+
+                foreach (ModButton button in buttons)
+                {
+                    button.ButtonColour = value;
+                }
+            }
+        }
+
+        private Color4 selectedColour = Color4.White;
+        public Color4 SelectedColour
+        {
+            get
+            {
+                return selectedColour;
+            }
+            set
+            {
+                if (value == selectedColour) return;
+                selectedColour = value;
+
+                foreach (ModButton button in buttons)
+                {
+                    button.SelectedColour = value;
+                }
+            }
+        }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            var index = Array.IndexOf(ToggleKeys, args.Key);
+            if (index > -1 && index < Buttons.Length)
+                Buttons[index].SelectNext();
+
+            return base.OnKeyDown(state, args);
+        }
+
+        public void DeselectAll()
+        {
+            foreach (ModButton button in buttons)
+            {
+                button.Deselect();
+            }
+        }
+
+        protected ModSection()
+        {
+            AutoSizeAxes = Axes.Y;
+
+            Children = new Drawable[]
+            {
+                headerLabel = new OsuSpriteText
+                {
+                    Origin = Anchor.TopLeft,
+                    Anchor = Anchor.TopLeft,
+                    Position = new Vector2(0f, 0f),
+                    Font = @"Exo2.0-Bold"
+                },
+                ButtonsContainer = new FillFlowContainer<ModButton>
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    Spacing = new Vector2(50f, 0f),
+                    Margin = new MarginPadding
+                    {
+                        Top = 6,
+                    },
+                    AlwaysPresent = true
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
new file mode 100644
index 0000000000..1be1b9a351
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -0,0 +1,332 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Configuration;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Backgrounds;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Modes;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class ModSelectOverlay : WaveOverlayContainer
+    {
+        private const int button_duration = 700;
+        private const int ranked_multiplier_duration = 700;
+        private const float content_width = 0.8f;
+
+        private Color4 lowMultiplierColour, highMultiplierColour;
+
+        private OsuSpriteText rankedLabel, multiplierLabel;
+        private FillFlowContainer rankedMultiplerContainer;
+
+        private FillFlowContainer<ModSection> modSectionsContainer;
+
+        public readonly Bindable<IEnumerable<Mod>> SelectedMods = new Bindable<IEnumerable<Mod>>();
+
+        public readonly Bindable<PlayMode> PlayMode = new Bindable<PlayMode>();
+
+        private void modeChanged(object sender, EventArgs eventArgs)
+        {
+            var ruleset = Ruleset.GetRuleset(PlayMode);
+            foreach (ModSection section in modSectionsContainer.Children)
+                section.Buttons = ruleset.GetModsFor(section.ModType).Select(m => new ModButton(m)).ToArray();
+            refreshSelectedMods();
+        }
+
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(OsuColour colours, OsuGame osu)
+        {
+            lowMultiplierColour = colours.Red;
+            highMultiplierColour = colours.Green;
+
+            if (osu != null)
+                PlayMode.BindTo(osu.PlayMode);
+            PlayMode.ValueChanged += modeChanged;
+            modeChanged(null, null);
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+
+            rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, APPEAR_DURATION, EasingTypes.InSine);
+            rankedMultiplerContainer.FadeOut(APPEAR_DURATION, EasingTypes.InSine);
+
+            foreach (ModSection section in modSectionsContainer.Children)
+            {
+                section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), APPEAR_DURATION, EasingTypes.InSine);
+                section.ButtonsContainer.MoveToX(100f, APPEAR_DURATION, EasingTypes.InSine);
+                section.ButtonsContainer.FadeOut(APPEAR_DURATION, EasingTypes.InSine);
+            }
+        }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            rankedMultiplerContainer.MoveToX(0, ranked_multiplier_duration, EasingTypes.OutQuint);
+            rankedMultiplerContainer.FadeIn(ranked_multiplier_duration, EasingTypes.OutQuint);
+
+            foreach (ModSection section in modSectionsContainer.Children)
+            {
+                section.ButtonsContainer.TransformSpacingTo(new Vector2(50f, 0f), button_duration, EasingTypes.OutQuint);
+                section.ButtonsContainer.MoveToX(0, button_duration, EasingTypes.OutQuint);
+                section.ButtonsContainer.FadeIn(button_duration, EasingTypes.OutQuint);
+            }
+        }
+
+        public void DeselectAll()
+        {
+            foreach (ModSection section in modSectionsContainer.Children)
+                section.DeselectAll();
+        }
+
+        public void DeselectTypes(Type[] modTypes)
+        {
+            if (modTypes.Length == 0) return;
+            foreach (ModSection section in modSectionsContainer.Children)
+                foreach (ModButton button in section.Buttons)
+                {
+                    Mod selected = button.SelectedMod;
+                    if (selected == null) continue;
+                    foreach (Type type in modTypes)
+                        if (type.IsInstanceOfType(selected))
+                            button.Deselect();
+                }
+        }
+
+        private void modButtonPressed(Mod selectedMod)
+        {
+            if (selectedMod != null)
+                DeselectTypes(selectedMod.IncompatibleMods);
+            refreshSelectedMods();
+        }
+
+        private void refreshSelectedMods()
+        {
+            SelectedMods.Value = modSectionsContainer.Children.SelectMany(s => s.Buttons.Select(x => x.SelectedMod).Where(x => x != null)).ToArray();
+
+            double multiplier = 1.0;
+            bool ranked = true;
+
+            foreach (Mod mod in SelectedMods.Value)
+            {
+                multiplier *= mod.ScoreMultiplier;
+                ranked &= mod.Ranked;
+            }
+
+            // 1.00x
+            // 1.05x
+            // 1.20x
+
+            multiplierLabel.Text = $"{multiplier:N2}x";
+            string rankedString = ranked ? "Ranked" : "Unranked";
+            rankedLabel.Text = $@"{rankedString}, Score Multiplier: ";
+
+            if (multiplier > 1.0)
+                multiplierLabel.FadeColour(highMultiplierColour, 200);
+            else if (multiplier < 1.0)
+                multiplierLabel.FadeColour(lowMultiplierColour, 200);
+            else
+                multiplierLabel.FadeColour(Color4.White, 200);
+        }
+
+        public ModSelectOverlay()
+        {
+            FirstWaveColour = OsuColour.FromHex(@"19b0e2");
+            SecondWaveColour = OsuColour.FromHex(@"2280a2");
+            ThirdWaveColour = OsuColour.FromHex(@"005774");
+            FourthWaveColour = OsuColour.FromHex(@"003a4e");
+
+            Height = 510;
+            Content.RelativeSizeAxes = Axes.X;
+            Content.AutoSizeAxes = Axes.Y;
+            Children = new Drawable[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = new Color4(36, 50, 68, 255)
+                        },
+                        new Triangles
+                        {
+                            TriangleScale = 5,
+                            RelativeSizeAxes = Axes.X,
+                            Height = Height, //set the height from the start to ensure correct triangle density.
+                            ColourLight = new Color4(53, 66, 82, 255),
+                            ColourDark = new Color4(41, 54, 70, 255),
+                        },
+                    },
+                },
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0f, 10f),
+                    Children = new Drawable[]
+                    {
+                        // Header
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 82,
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = OsuColour.Gray(10).Opacity(100),
+                                },
+                                new FillFlowContainer
+                                {
+                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopCentre,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Direction = FillDirection.Vertical,
+                                    Width = content_width,
+                                    Padding = new MarginPadding
+                                    {
+                                        Top = 10,
+                                        Bottom = 10,
+                                    },
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Font = @"Exo2.0-Bold",
+                                            Text = @"Gameplay Mods",
+                                            TextSize = 22,
+                                            Shadow = true,
+                                            Margin = new MarginPadding
+                                            {
+                                                Bottom = 4,
+                                            },
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Text = @"Mods provide different ways to enjoy gameplay. Some have an effect on the score you can achieve during ranked play.",
+                                            TextSize = 18,
+                                            Shadow = true,
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Text = @"Others are just for fun",
+                                            TextSize = 18,
+                                            Shadow = true,
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                        // Body
+                        modSectionsContainer = new FillFlowContainer<ModSection>
+                        {
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Spacing = new Vector2(0f, 10f),
+                            Width = content_width,
+                            Children = new ModSection[]
+                            {
+                                new DifficultyReductionSection
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopCentre,
+                                    Action = modButtonPressed,
+                                },
+                                new DifficultyIncreaseSection
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopCentre,
+                                    Action = modButtonPressed,
+                                },
+                                new AssistedSection
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopCentre,
+                                    Action = modButtonPressed,
+                                },
+                            }
+                        },
+                        // Footer
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 70,
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = new Color4(172, 20, 116, 255),
+                                    Alpha = 0.5f,
+                                },
+                                rankedMultiplerContainer = new FillFlowContainer
+                                {
+                                    Origin = Anchor.BottomCentre,
+                                    Anchor = Anchor.BottomCentre,
+                                    AutoSizeAxes = Axes.Y,
+                                    RelativeSizeAxes = Axes.X,
+                                    Width = content_width,
+                                    Direction = FillDirection.Horizontal,
+                                    Padding = new MarginPadding
+                                    {
+                                        Top = 20,
+                                        Bottom = 20,
+                                    },
+                                    Children = new Drawable[]
+                                    {
+                                        rankedLabel = new OsuSpriteText
+                                        {
+                                            Text = @"Ranked, Score Multiplier: ",
+                                            TextSize = 30,
+                                            Shadow = true,
+                                        },
+                                        multiplierLabel = new OsuSpriteText
+                                        {
+                                            Font = @"Exo2.0-Bold",
+                                            Text = @"1.00x",
+                                            TextSize = 30,
+                                            Shadow = true,
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 430654b8f5..1b4692f50e 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
@@ -23,6 +23,7 @@ using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Graphics.Sprites;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Overlays
 {
@@ -30,7 +31,7 @@ namespace osu.Game.Overlays
     {
         private MusicControllerBackground backgroundSprite;
         private DragBar progress;
-        private TextAwesome playButton, listButton;
+        private TextAwesome playButton;
         private SpriteText title, artist;
 
         private List<BeatmapSetInfo> playList;
@@ -59,7 +60,9 @@ namespace osu.Game.Overlays
 
         protected override bool OnDrag(InputState state)
         {
-            Vector2 change = (state.Mouse.Position - state.Mouse.PositionMouseDown.Value);
+            Trace.Assert(state.Mouse.PositionMouseDown != null, "state.Mouse.PositionMouseDown != null");
+
+            Vector2 change = state.Mouse.Position - state.Mouse.PositionMouseDown.Value;
 
             // Diminish the drag distance as we go further to simulate "rubber band" feeling.
             change *= (float)Math.Pow(change.Length, 0.7f) / change.Length;
@@ -187,7 +190,7 @@ namespace osu.Game.Overlays
                             Position = new Vector2(20, -30),
                             Children = new Drawable[]
                             {
-                                listButton = new TextAwesome
+                                new TextAwesome
                                 {
                                     TextSize = 15,
                                     Icon = FontAwesome.fa_bars,
@@ -246,14 +249,14 @@ namespace osu.Game.Overlays
             }
         }
 
-        void preferUnicode_changed(object sender, EventArgs e)
+        private void preferUnicode_changed(object sender, EventArgs e)
         {
             updateDisplay(current, TransformDirection.None);
         }
 
         private void workingChanged(object sender = null, EventArgs e = null)
         {
-            progress.IsEnabled = (beatmapSource.Value != null);
+            progress.IsEnabled = beatmapSource.Value != null;
             if (beatmapSource.Value == current) return;
             bool audioEquals = current?.BeatmapInfo?.AudioEquals(beatmapSource?.Value?.BeatmapInfo) ?? false;
             current = beatmapSource.Value;
@@ -323,7 +326,7 @@ namespace osu.Game.Overlays
             updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev);
         }
 
-        Action pendingBeatmapSwitch;
+        private Action pendingBeatmapSwitch;
 
         private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction)
         {
@@ -384,7 +387,7 @@ namespace osu.Game.Overlays
             base.Dispose(isDisposing);
         }
 
-        const float transition_length = 800;
+        private const float transition_length = 800;
 
         protected override void PopIn()
         {
diff --git a/osu.Game/Overlays/NotificationManager.cs b/osu.Game/Overlays/NotificationManager.cs
index 5c666da8ae..8f455d44e7 100644
--- a/osu.Game/Overlays/NotificationManager.cs
+++ b/osu.Game/Overlays/NotificationManager.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
-using osu.Game.Graphics;
 using osu.Game.Overlays.Notifications;
 using OpenTK.Graphics;
 
@@ -46,7 +45,7 @@ namespace osu.Game.Overlays
                     {
                         sections = new FillFlowContainer<NotificationSection>
                         {
-                            Direction = FillDirection.Down,
+                            Direction = FillDirection.Vertical,
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
                             Children = new []
@@ -70,7 +69,7 @@ namespace osu.Game.Overlays
             };
         }
 
-        int runningDepth = 0;
+        private int runningDepth;
 
         public void Post(Notification notification)
         {
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 179e9bf066..ea07d7806a 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -42,18 +43,9 @@ namespace osu.Game.Overlays.Notifications
 
         protected Container NotificationContent;
 
-        private bool read;
+        public virtual bool Read { get; set; }
 
-        public virtual bool Read
-        {
-            get { return read; }
-            set
-            {
-                read = value;
-            }
-        }
-
-        public Notification()
+        protected Notification()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -161,7 +153,7 @@ namespace osu.Game.Overlays.Notifications
             Expire();
         }
 
-        class CloseButton : ClickableContainer
+        private class CloseButton : ClickableContainer
         {
             private Color4 hoverColour;
 
@@ -175,6 +167,7 @@ namespace osu.Game.Overlays.Notifications
                     new TextAwesome
                     {
                         Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
                         Icon = FontAwesome.fa_times_circle,
                     }
                 };
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 91c89d41be..e5debc9c9b 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Notifications
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Down;
+            Direction = FillDirection.Vertical;
 
             Padding = new MarginPadding
             {
@@ -133,7 +133,7 @@ namespace osu.Game.Overlays.Notifications
             countText.Text = notifications.Children.Count(c => c.Alpha > 0.99f).ToString();
         }
 
-        class ClearAllButton : ClickableContainer
+        private class ClearAllButton : ClickableContainer
         {
             private OsuSpriteText text;
 
diff --git a/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs b/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs
index 492a948143..cd1ce56011 100644
--- a/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressCompletionNotification.cs
@@ -10,11 +10,8 @@ namespace osu.Game.Overlays.Notifications
 {
     public class ProgressCompletionNotification : SimpleNotification
     {
-        private ProgressNotification progressNotification;
-
-        public ProgressCompletionNotification(ProgressNotification progressNotification)
+        public ProgressCompletionNotification()
         {
-            this.progressNotification = progressNotification;
             Icon = FontAwesome.fa_check;
         }
 
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 6124884add..9dcee5c8af 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Overlays.Notifications
 
         private ProgressNotificationState state;
 
-        protected virtual Notification CreateCompletionNotification() => new ProgressCompletionNotification(this)
+        protected virtual Notification CreateCompletionNotification() => new ProgressCompletionNotification()
         {
             Activated = CompletionClickAction,
             Text = $"Task \"{Text}\" has completed!"
@@ -168,7 +168,7 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public Func<bool> CompletionClickAction;
 
-        class ProgressBar : Container
+        private class ProgressBar : Container
         {
             private Box box;
 
diff --git a/osu.Game/Overlays/Notifications/SimpleNotification.cs b/osu.Game/Overlays/Notifications/SimpleNotification.cs
index c9c56e8d4a..b06994d61a 100644
--- a/osu.Game/Overlays/Notifications/SimpleNotification.cs
+++ b/osu.Game/Overlays/Notifications/SimpleNotification.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Overlays.Notifications
                 iconDrawable = new TextAwesome
                 {
                     Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Icon = icon,
                 }
             });
@@ -80,10 +81,8 @@ namespace osu.Game.Overlays.Notifications
 
             set
             {
-                if (base.Read = value)
-                    Light.FadeOut(100);
-                else
-                    Light.FadeIn(100);
+                base.Read = value;
+                Light.FadeTo(value ? 1 : 0, 100);
             }
         }
     }
diff --git a/osu.Game/Overlays/Options/OptionDropDown.cs b/osu.Game/Overlays/Options/OptionDropDown.cs
index 7e2cab2a61..4387e90b5a 100644
--- a/osu.Game/Overlays/Options/OptionDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionDropDown.cs
@@ -39,19 +39,19 @@ namespace osu.Game.Overlays.Options
                 bindable.ValueChanged += bindable_ValueChanged;
                 bindable_ValueChanged(null, null);
 
-                if (bindable?.Disabled ?? true)
+                if (bindable.Disabled)
                     Alpha = 0.3f;
             }
         }
 
         private Bindable<T> bindable;
 
-        void bindable_ValueChanged(object sender, EventArgs e)
+        private void bindable_ValueChanged(object sender, EventArgs e)
         {
             dropdown.SelectedValue = bindable.Value;
         }
 
-        void dropdown_ValueChanged(object sender, EventArgs e)
+        private void dropdown_ValueChanged(object sender, EventArgs e)
         {
             bindable.Value = dropdown.SelectedValue;
         }
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Options
         {
             Items = new KeyValuePair<string, T>[0];
 
-            Direction = FillDirection.Down;
+            Direction = FillDirection.Vertical;
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Children = new Drawable[]
diff --git a/osu.Game/Overlays/Options/OptionLabel.cs b/osu.Game/Overlays/Options/OptionLabel.cs
index bfe59eb035..4b0f1e4ec0 100644
--- a/osu.Game/Overlays/Options/OptionLabel.cs
+++ b/osu.Game/Overlays/Options/OptionLabel.cs
@@ -7,7 +7,7 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Options
 {
-    class OptionLabel : OsuSpriteText
+    internal class OptionLabel : OsuSpriteText
     {
         [BackgroundDependencyLoader]
         private void load(OsuColour colour)
diff --git a/osu.Game/Overlays/Options/OptionsFooter.cs b/osu.Game/Overlays/Options/OptionsFooter.cs
new file mode 100644
index 0000000000..23622aef08
--- /dev/null
+++ b/osu.Game/Overlays/Options/OptionsFooter.cs
@@ -0,0 +1,68 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Modes;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Overlays.Options
+{
+    public class OptionsFooter : FillFlowContainer
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuGameBase game, OsuColour colours)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+            Padding = new MarginPadding { Top = 20, Bottom = 30 };
+
+            var modes = new List<Drawable>();
+
+            foreach (PlayMode m in Enum.GetValues(typeof(PlayMode)))
+                modes.Add(new TextAwesome
+                {
+                    Icon = Ruleset.GetRuleset(m).Icon,
+                    Colour = Color4.Gray,
+                });
+
+            Children = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Direction = FillDirection.Full,
+                    AutoSizeAxes = Axes.Both,
+                    Children = modes,
+                    Spacing = new Vector2(5),
+                    Padding = new MarginPadding { Bottom = 10 },
+                },
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Text = game.Name,
+                    TextSize = 18,
+                    Font = @"Exo2.0-Bold",
+                },
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    TextSize = 14,
+                    Text = game.Version,
+                    Colour = game.IsDebug ? colours.Red : Color4.White,
+                },
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Overlays/Options/OptionsSection.cs b/osu.Game/Overlays/Options/OptionsSection.cs
index f87e69e307..25e891b5c9 100644
--- a/osu.Game/Overlays/Options/OptionsSection.cs
+++ b/osu.Game/Overlays/Options/OptionsSection.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Options
 
         private SpriteText headerLabel;
 
-        public OptionsSection()
+        protected OptionsSection()
         {
             Margin = new MarginPadding { Top = 20 };
             AutoSizeAxes = Axes.Y;
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Options
                         FlowContent = new FillFlowContainer
                         {
                             Margin = new MarginPadding { Top = header_size + header_margin },
-                            Direction = FillDirection.Down,
+                            Direction = FillDirection.Vertical,
                             Spacing = new Vector2(0, 30),
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Overlays/Options/OptionsSubsection.cs b/osu.Game/Overlays/Options/OptionsSubsection.cs
index ef10e15abf..a6baf0a6cd 100644
--- a/osu.Game/Overlays/Options/OptionsSubsection.cs
+++ b/osu.Game/Overlays/Options/OptionsSubsection.cs
@@ -11,16 +11,17 @@ namespace osu.Game.Overlays.Options
 {
     public abstract class OptionsSubsection : FillFlowContainer
     {
-        private Container<Drawable> content;
         protected override Container<Drawable> Content => content;
 
+        private Container<Drawable> content;
+
         protected abstract string Header { get; }
 
-        public OptionsSubsection()
+        protected OptionsSubsection()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Down;
+            Direction = FillDirection.Vertical;
             AddInternal(new Drawable[]
             {
                 new OsuSpriteText
@@ -31,7 +32,7 @@ namespace osu.Game.Overlays.Options
                 },
                 content = new FillFlowContainer
                 {
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     Spacing = new Vector2(0, 5),
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
diff --git a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
index 06ddf584b2..25585845b0 100644
--- a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
@@ -32,12 +32,11 @@ namespace osu.Game.Overlays.Options.Sections.Audio
 
         private void updateItems()
         {
-            var deviceItems = new List<KeyValuePair<string, string>>();
-            deviceItems.Add(new KeyValuePair<string, string>("Default", string.Empty));
+            var deviceItems = new List<KeyValuePair<string, string>> { new KeyValuePair<string, string>("Default", string.Empty) };
             deviceItems.AddRange(audio.AudioDeviceNames.Select(d => new KeyValuePair<string, string>(d, d)));
 
             var preferredDeviceName = audio.AudioDevice.Value;
-            if (!deviceItems.Any(kv => kv.Value == preferredDeviceName))
+            if (deviceItems.All(kv => kv.Value != preferredDeviceName))
                 deviceItems.Add(new KeyValuePair<string, string>(preferredDeviceName, preferredDeviceName));
 
             dropdown.Items = deviceItems;
@@ -51,7 +50,7 @@ namespace osu.Game.Overlays.Options.Sections.Audio
 
             Children = new Drawable[]
             {
-                dropdown = new OptionDropDown<string>()
+                dropdown = new OptionDropDown<string>
                 {
                     Bindable = audio.AudioDevice
                 },
diff --git a/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs b/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
index 2f04bfe88b..ada57e8dd0 100644
--- a/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
@@ -6,7 +6,6 @@ using System.Runtime;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options.Sections.Debug
diff --git a/osu.Game/Overlays/Options/Sections/Debug/GeneralOptions.cs b/osu.Game/Overlays/Options/Sections/Debug/GeneralOptions.cs
new file mode 100644
index 0000000000..34901e1dac
--- /dev/null
+++ b/osu.Game/Overlays/Options/Sections/Debug/GeneralOptions.cs
@@ -0,0 +1,28 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Options.Sections.Debug
+{
+    public class GeneralOptions : OptionsSubsection
+    {
+        protected override string Header => "General";
+
+        [BackgroundDependencyLoader]
+        private void load(FrameworkDebugConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new OsuCheckbox
+                {
+                    LabelText = "Bypass caching",
+                    Bindable = config.GetBindable<bool>(FrameworkDebugConfig.BypassCaching)
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Options/Sections/DebugSection.cs b/osu.Game/Overlays/Options/Sections/DebugSection.cs
index 0839088f08..a90558a319 100644
--- a/osu.Game/Overlays/Options/Sections/DebugSection.cs
+++ b/osu.Game/Overlays/Options/Sections/DebugSection.cs
@@ -16,6 +16,7 @@ namespace osu.Game.Overlays.Options.Sections
         {
             Children = new Drawable[]
             {
+                new GeneralOptions(),
                 new GCOptions(),
             };
         }
diff --git a/osu.Game/Overlays/Options/Sections/EditorSection.cs b/osu.Game/Overlays/Options/Sections/EditorSection.cs
index 11d3f6b642..513d89c601 100644
--- a/osu.Game/Overlays/Options/Sections/EditorSection.cs
+++ b/osu.Game/Overlays/Options/Sections/EditorSection.cs
@@ -7,7 +7,6 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
-using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Overlays.Options.Sections
 {
diff --git a/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs b/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
index b06644facd..f95d3a026e 100644
--- a/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Options.Sections.General
             }
         }
 
-        class LoginForm : FillFlowContainer
+        private class LoginForm : FillFlowContainer
         {
             private TextBox username;
             private TextBox password;
@@ -100,7 +100,7 @@ namespace osu.Game.Overlays.Options.Sections.General
             private void load(APIAccess api, OsuConfigManager config)
             {
                 this.api = api;
-                Direction = FillDirection.Down;
+                Direction = FillDirection.Vertical;
                 Spacing = new Vector2(0, 5);
                 AutoSizeAxes = Axes.Y;
                 RelativeSizeAxes = Axes.X;
@@ -117,7 +117,8 @@ namespace osu.Game.Overlays.Options.Sections.General
                     {
                         PlaceholderText = "Password",
                         RelativeSizeAxes = Axes.X,
-                        TabbableContentContainer = this
+                        TabbableContentContainer = this,
+                        OnCommit = (sender, newText) => performLogin()
                     },
                     new OsuCheckbox
                     {
diff --git a/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs b/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs
index 5393c42843..638c1c9a64 100644
--- a/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs
+++ b/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
-using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Overlays.Options.Sections
 {
@@ -39,12 +38,6 @@ namespace osu.Game.Overlays.Options.Sections
                     RelativeSizeAxes = Axes.X,
                     Text = "Run osu! updater",
                 },
-                new OptionLabel
-                {
-                    Text = "TODO: osu version here",
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                },
             };
         }
     }
diff --git a/osu.Game/Overlays/Options/Sections/SkinSection.cs b/osu.Game/Overlays/Options/Sections/SkinSection.cs
index 71c460760e..56dd9ca318 100644
--- a/osu.Game/Overlays/Options/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Options/Sections/SkinSection.cs
@@ -8,7 +8,6 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
-using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Overlays.Options.Sections
 {
diff --git a/osu.Game/Overlays/Options/Sidebar.cs b/osu.Game/Overlays/Options/Sidebar.cs
index 5a1128749c..b0618ed3a6 100644
--- a/osu.Game/Overlays/Options/Sidebar.cs
+++ b/osu.Game/Overlays/Options/Sidebar.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Options
                             Anchor = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
-                            Direction = FillDirection.Down,
+                            Direction = FillDirection.Vertical,
                         }
                     }
                 },
diff --git a/osu.Game/Overlays/OptionsOverlay.cs b/osu.Game/Overlays/OptionsOverlay.cs
index 968914c6c0..53d8cb3593 100644
--- a/osu.Game/Overlays/OptionsOverlay.cs
+++ b/osu.Game/Overlays/OptionsOverlay.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays
                         {
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
-                            Direction = FillDirection.Down,
+                            Direction = FillDirection.Vertical,
 
                             Children = new Drawable[]
                             {
@@ -98,9 +98,10 @@ namespace osu.Game.Overlays
                                 {
                                     AutoSizeAxes = Axes.Y,
                                     RelativeSizeAxes = Axes.X,
-                                    Direction = FillDirection.Down,
+                                    Direction = FillDirection.Vertical,
                                     Children = sections,
-                                }
+                                },
+                                new OptionsFooter()
                             }
                         }
                     }
@@ -146,11 +147,8 @@ namespace osu.Game.Overlays
 
                 var previous = sidebarButtons.SingleOrDefault(sb => sb.Selected);
                 var next = sidebarButtons.SingleOrDefault(sb => sb.Section == bestCandidate);
-                if (next != null)
-                {
-                    previous.Selected = false;
-                    next.Selected = true;
-                }
+                if (previous != null) previous.Selected = false;
+                if (next != null) next.Selected = true;
             }
         }
 
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 74cfc10e75..79698a4f3e 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -29,7 +30,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool BlockPassThroughInput => false;
 
-        private const int transition_time = 500;
+        private const double transition_time = 500;
 
         private const float alpha_hovering = 0.8f;
         private const float alpha_normal = 0.6f;
@@ -43,19 +44,22 @@ namespace osu.Game.Overlays.Toolbar
                 new ToolbarBackground(),
                 new FillFlowContainer
                 {
-                    Direction = FillDirection.Right,
+                    Direction = FillDirection.Horizontal,
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
                         new ToolbarSettingsButton(),
-                        new ToolbarHomeButton()
+                        new ToolbarHomeButton
                         {
                             Action = () => OnHome?.Invoke()
                         },
                         modeSelector = new ToolbarModeSelector
                         {
-                            OnPlayModeChange = OnPlayModeChange
+                            OnPlayModeChange = mode =>
+                            {
+                                OnPlayModeChange?.Invoke(mode);
+                            }
                         }
                     }
                 },
@@ -63,7 +67,7 @@ namespace osu.Game.Overlays.Toolbar
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    Direction = FillDirection.Right,
+                    Direction = FillDirection.Horizontal,
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
@@ -141,7 +145,7 @@ namespace osu.Game.Overlays.Toolbar
             FadeOut(transition_time);
         }
 
-        class PassThroughFlowContainer : FillFlowContainer
+        private class PassThroughFlowContainer : FillFlowContainer
         {
             //needed to get input to the login overlay.
             public override bool Contains(Vector2 screenSpacePos) => true;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 0e8165283e..17cef48f38 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -84,7 +85,7 @@ namespace osu.Game.Overlays.Toolbar
                 },
                 Flow = new FillFlowContainer
                 {
-                    Direction = FillDirection.Right,
+                    Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(5),
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
@@ -107,7 +108,7 @@ namespace osu.Game.Overlays.Toolbar
                 },
                 tooltipContainer = new FillFlowContainer
                 {
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     RelativeSizeAxes = Axes.Both, //stops us being considered in parent's autosize
                     Anchor = (TooltipAnchor & Anchor.x0) > 0 ? Anchor.BottomLeft : Anchor.BottomRight,
                     Origin = TooltipAnchor,
diff --git a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
index 4dca6b7a16..431cc73887 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
@@ -5,7 +5,7 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    class ToolbarHomeButton : ToolbarButton
+    internal class ToolbarHomeButton : ToolbarButton
     {
         public ToolbarHomeButton()
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarModeButton.cs b/osu.Game/Overlays/Toolbar/ToolbarModeButton.cs
index 1bcc0bf828..62359b05ae 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarModeButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarModeButton.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Extensions;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Modes;
 using OpenTK.Graphics;
@@ -17,8 +16,8 @@ namespace osu.Game.Overlays.Toolbar
             set
             {
                 mode = value;
-                TooltipMain = mode.GetDescription();
-                TooltipSub = $"Play some {mode.GetDescription()}";
+                TooltipMain = Ruleset.GetRuleset(mode).Description;
+                TooltipSub = $"Play some {Ruleset.GetRuleset(mode).Description}";
                 Icon = Ruleset.GetRuleset(mode).Icon;
             }
         }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
index 31b8500155..30474ad796 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
@@ -15,9 +15,9 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    class ToolbarModeSelector : Container
+    internal class ToolbarModeSelector : Container
     {
-        const float padding = 10;
+        private const float padding = 10;
 
         private FillFlowContainer modeButtons;
         private Drawable modeButtonLine;
@@ -29,14 +29,14 @@ namespace osu.Game.Overlays.Toolbar
         {
             RelativeSizeAxes = Axes.Y;
 
-            Children = new Drawable[]
+            Children = new[]
             {
                 new OpaqueBackground(),
                 modeButtons = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
-                    Direction = FillDirection.Right,
+                    Direction = FillDirection.Horizontal,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Padding = new MarginPadding { Left = padding, Right = padding },
@@ -64,11 +64,8 @@ namespace osu.Game.Overlays.Toolbar
                 }
             };
 
-            int amountButtons = 0;
-            foreach (PlayMode m in Enum.GetValues(typeof(PlayMode)))
+            foreach (PlayMode m in Ruleset.PlayModes)
             {
-                ++amountButtons;
-
                 var localMode = m;
                 modeButtons.Add(new ToolbarModeButton
                 {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
index d839cfab14..725af09ee7 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
@@ -6,7 +6,7 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    class ToolbarMusicButton : ToolbarOverlayToggleButton
+    internal class ToolbarMusicButton : ToolbarOverlayToggleButton
     {
         public ToolbarMusicButton()
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
index 973f9f2d8a..4da87a0568 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
@@ -7,7 +7,7 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    class ToolbarNotificationButton : ToolbarOverlayToggleButton
+    internal class ToolbarNotificationButton : ToolbarOverlayToggleButton
     {
         protected override Anchor TooltipAnchor => Anchor.TopRight;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
index c4a9c51349..991c76e164 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -8,7 +9,7 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    class ToolbarOverlayToggleButton : ToolbarButton
+    internal class ToolbarOverlayToggleButton : ToolbarButton
     {
         private Box stateBackground;
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
index bb72642a65..9f8170b604 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
@@ -6,7 +6,7 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    class ToolbarSettingsButton : ToolbarOverlayToggleButton
+    internal class ToolbarSettingsButton : ToolbarOverlayToggleButton
     {
         public ToolbarSettingsButton()
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserArea.cs b/osu.Game/Overlays/Toolbar/ToolbarUserArea.cs
index 1955ef5c1c..9de0f290a5 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserArea.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserArea.cs
@@ -8,7 +8,7 @@ using OpenTK;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    class ToolbarUserArea : Container
+    internal class ToolbarUserArea : Container
     {
         public LoginOverlay LoginOverlay;
         private ToolbarUserButton button;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index e3f20d26a4..89af56c18c 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -10,11 +11,10 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Online.API;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    class ToolbarUserButton : ToolbarButton, IOnlineComponent
+    internal class ToolbarUserButton : ToolbarButton, IOnlineComponent
     {
         private Avatar avatar;
 
@@ -94,11 +94,7 @@ namespace osu.Game.Overlays.Toolbar
 
                     userId = value;
 
-                    Sprite newSprite;
-                    if (userId > 1)
-                        newSprite = new OnlineSprite($@"https://a.ppy.sh/{userId}");
-                    else
-                        newSprite = new Sprite { Texture = guestTexture };
+                    var newSprite = userId > 1 ? new OnlineSprite($@"https://a.ppy.sh/{userId}") : new Sprite { Texture = guestTexture };
 
                     newSprite.FillMode = FillMode.Fit;
 
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
new file mode 100644
index 0000000000..747b46aecc
--- /dev/null
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -0,0 +1,220 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework;
+using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
+using System;
+
+namespace osu.Game.Overlays
+{
+    public abstract class WaveOverlayContainer : FocusedOverlayContainer
+    {
+        protected const float APPEAR_DURATION = 800;
+        protected const float DISAPPEAR_DURATION = 500;
+
+        private const EasingTypes easing_show = EasingTypes.OutSine;
+        private const EasingTypes easing_hide = EasingTypes.InSine;
+
+        private Wave firstWave, secondWave, thirdWave, fourthWave;
+
+        private Container<Wave> wavesContainer;
+
+        private readonly Container contentContainer;
+
+        protected override Container<Drawable> Content => contentContainer;
+
+        protected Color4 FirstWaveColour
+        {
+            get
+            {
+                return firstWave.Colour;
+            }
+            set
+            {
+                if (firstWave.Colour == value) return;
+                firstWave.Colour = value;
+            }
+        }
+
+        protected Color4 SecondWaveColour
+        {
+            get
+            {
+                return secondWave.Colour;
+            }
+            set
+            {
+                if (secondWave.Colour == value) return;
+                secondWave.Colour = value;
+            }
+        }
+
+        protected Color4 ThirdWaveColour
+        {
+            get
+            {
+                return thirdWave.Colour;
+            }
+            set
+            {
+                if (thirdWave.Colour == value) return;
+                thirdWave.Colour = value;
+            }
+        }
+
+        protected Color4 FourthWaveColour
+        {
+            get
+            {
+                return fourthWave.Colour;
+            }
+            set
+            {
+                if (fourthWave.Colour == value) return;
+                fourthWave.Colour = value;
+            }
+        }
+
+        protected WaveOverlayContainer()
+        {
+            Masking = true;
+
+            AddInternal(wavesContainer = new Container<Wave>
+            {
+                RelativeSizeAxes = Axes.X,
+                Origin = Anchor.TopCentre,
+                Anchor = Anchor.TopCentre,
+                Masking = true,
+                Children = new[]
+                {
+                    firstWave = new Wave
+                    {
+                        Rotation = 13,
+                        FinalPosition = -930,
+                    },
+                    secondWave = new Wave
+                    {
+                        Origin = Anchor.TopRight,
+                        Anchor = Anchor.TopRight,
+                        Rotation = -7,
+                        FinalPosition = -560,
+                    },
+                    thirdWave = new Wave
+                    {
+                        Rotation = 4,
+                        FinalPosition = -390,
+                    },
+                    fourthWave = new Wave
+                    {
+                        Origin = Anchor.TopRight,
+                        Anchor = Anchor.TopRight,
+                        Rotation = -2,
+                        FinalPosition = -220,
+                    },
+                },
+            });
+
+            AddInternal(contentContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+            });
+        }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            foreach (var w in wavesContainer.Children)
+                w.State = Visibility.Visible;
+
+            FadeIn(100, EasingTypes.OutQuint);
+            contentContainer.MoveToY(0, APPEAR_DURATION, EasingTypes.OutQuint);
+
+            FadeIn(100, EasingTypes.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+
+            FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint);
+            contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, EasingTypes.In);
+
+            foreach (var w in wavesContainer.Children)
+                w.State = Visibility.Hidden;
+
+            FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint);
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            // This is done as an optimization, such that invisible parts of the waves
+            // are masked away, and thus do not consume fill rate.
+            wavesContainer.Height = Math.Max(0, DrawHeight - (contentContainer.DrawHeight - contentContainer.Y));
+        }
+
+        private class Wave : Container, IStateful<Visibility>
+        {
+            public float FinalPosition;
+
+            public Wave()
+            {
+                RelativeSizeAxes = Axes.X;
+                Width = 1.5f;
+                Masking = true;
+                EdgeEffect = new EdgeEffect
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Colour = Color4.Black.Opacity(50),
+                    Radius = 20f,
+                };
+
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                };
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                // We can not use RelativeSizeAxes for Height, because the height
+                // of our parent diminishes as the content moves up.
+                Height = Parent.Parent.DrawSize.Y * 1.5f;
+            }
+
+            private Visibility state;
+            public Visibility State
+            {
+                get { return state; }
+                set
+                {
+                    state = value;
+
+                    switch (value)
+                    {
+                        case Visibility.Hidden:
+                            MoveToY(Parent.Parent.DrawSize.Y, DISAPPEAR_DURATION, easing_hide);
+                            break;
+                        case Visibility.Visible:
+                            MoveToY(FinalPosition, APPEAR_DURATION, easing_show);
+                            break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index a71eac5fae..dd41294598 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Screens
             return other?.GetType() == GetType();
         }
 
-        const float transition_length = 500;
-        const float x_movement_amount = 50;
+        private const float transition_length = 500;
+        private const float x_movement_amount = 50;
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {
@@ -28,7 +28,7 @@ namespace osu.Game.Screens
             return false;
         }
 
-        Framework.Game game;
+        private Framework.Game game;
 
         [BackgroundDependencyLoader]
         private void load(Framework.Game game)
@@ -58,7 +58,7 @@ namespace osu.Game.Screens
         protected override void Update()
         {
             base.Update();
-            Content.Scale = new Vector2(1 + (x_movement_amount / DrawSize.X) * 2);
+            Content.Scale = new Vector2(1 + x_movement_amount / DrawSize.X * 2);
         }
 
         protected override void OnEntering(Screen last)
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 6a8328cf8c..9c352aad80 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -30,11 +30,7 @@ namespace osu.Game.Screens.Backgrounds
 
                 Schedule(() =>
                 {
-                    Background newBackground;
-                    if (beatmap == null)
-                        newBackground = new Background(@"Backgrounds/bg1");
-                    else
-                        newBackground = new BeatmapBackground(beatmap);
+                    var newBackground = beatmap == null ? new Background(@"Backgrounds/bg1") : new BeatmapBackground(beatmap);
 
                     newBackground.LoadAsync(Game, delegate
                     {
@@ -68,10 +64,13 @@ namespace osu.Game.Screens.Backgrounds
 
         public override bool Equals(BackgroundScreen other)
         {
-            return base.Equals(other) && beatmap == ((BackgroundScreenBeatmap)other).Beatmap;
+            var otherBeatmapBackground = other as BackgroundScreenBeatmap;
+            if (otherBeatmapBackground == null) return false;
+
+            return base.Equals(other) && beatmap == otherBeatmapBackground.Beatmap;
         }
 
-        class BeatmapBackground : Background
+        private class BeatmapBackground : Background
         {
             private WorkingBeatmap beatmap;
 
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
index 9ec8628c5f..dd377938a7 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenCustom.cs
@@ -17,7 +17,10 @@ namespace osu.Game.Screens.Backgrounds
 
         public override bool Equals(BackgroundScreen other)
         {
-            return base.Equals(other) && textureName == ((BackgroundScreenCustom)other).textureName;
+            var backgroundScreenCustom = other as BackgroundScreenCustom;
+            if (backgroundScreenCustom == null) return false;
+
+            return base.Equals(other) && textureName == backgroundScreenCustom.textureName;
         }
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Screens/Charts/ChartInfo.cs b/osu.Game/Screens/Charts/ChartInfo.cs
index f85d3acb69..b5ac5e4945 100644
--- a/osu.Game/Screens/Charts/ChartInfo.cs
+++ b/osu.Game/Screens/Charts/ChartInfo.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Screens.Charts
 {
-    class ChartInfo : ScreenWhiteBox
+    internal class ChartInfo : ScreenWhiteBox
     {
     }
 }
diff --git a/osu.Game/Screens/Charts/ChartListing.cs b/osu.Game/Screens/Charts/ChartListing.cs
index b570b63c06..7bc6f0fa03 100644
--- a/osu.Game/Screens/Charts/ChartListing.cs
+++ b/osu.Game/Screens/Charts/ChartListing.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Screens.Charts
 {
-    class ChartListing : ScreenWhiteBox
+    internal class ChartListing : ScreenWhiteBox
     {
         protected override IEnumerable<Type> PossibleChildren => new[] {
                 typeof(ChartInfo)
diff --git a/osu.Game/Screens/Direct/OnlineListing.cs b/osu.Game/Screens/Direct/OnlineListing.cs
index 28de1c58d9..9ce23c2863 100644
--- a/osu.Game/Screens/Direct/OnlineListing.cs
+++ b/osu.Game/Screens/Direct/OnlineListing.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Screens.Direct
 {
-    class OnlineListing : ScreenWhiteBox
+    internal class OnlineListing : ScreenWhiteBox
     {
     }
 }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 284a7f6f94..9d98a0f165 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -7,7 +7,7 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Edit
 {
-    class Editor : ScreenWhiteBox
+    internal class Editor : ScreenWhiteBox
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
 
diff --git a/osu.Game/Screens/GameScreenWhiteBox.cs b/osu.Game/Screens/GameScreenWhiteBox.cs
index 623b411e35..f659d3681e 100644
--- a/osu.Game/Screens/GameScreenWhiteBox.cs
+++ b/osu.Game/Screens/GameScreenWhiteBox.cs
@@ -21,11 +21,10 @@ namespace osu.Game.Screens
     {
         private BackButton popButton;
 
-        const int transition_time = 1000;
+        private const double transition_time = 1000;
 
         protected virtual IEnumerable<Type> PossibleChildren => null;
 
-        private FillFlowContainer childModeButtons;
         private Container textContainer;
         private Box box;
 
@@ -56,7 +55,7 @@ namespace osu.Game.Screens
 
         protected override bool OnExiting(Screen next)
         {
-            textContainer.MoveTo(new Vector2((DrawSize.X / 16), 0), transition_time, EasingTypes.OutExpo);
+            textContainer.MoveTo(new Vector2(DrawSize.X / 16, 0), transition_time, EasingTypes.OutExpo);
             Content.FadeOut(transition_time, EasingTypes.OutExpo);
 
             return base.OnExiting(next);
@@ -80,6 +79,8 @@ namespace osu.Game.Screens
 
         public ScreenWhiteBox()
         {
+            FillFlowContainer childModeButtons;
+
             Children = new Drawable[]
             {
                 box = new Box
@@ -126,7 +127,7 @@ namespace osu.Game.Screens
                 },
                 childModeButtons = new FillFlowContainer
                 {
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index a3c7be8453..41ca9df83b 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -7,7 +7,7 @@ using osu.Game.Screens.Menu;
 
 namespace osu.Game.Screens
 {
-    class Loader : OsuScreen
+    internal class Loader : OsuScreen
     {
         internal override bool ShowOverlays => false;
 
diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index 7398eb62e7..7af03d2f11 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Input;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Screens.Menu
 {
@@ -27,16 +28,11 @@ namespace osu.Game.Screens.Menu
     {
         private Container iconText;
         private Container box;
-        private Box boxColourLayer;
         private Box boxHoverLayer;
-        private Color4 colour;
         private TextAwesome icon;
         private string internalName;
-        private readonly FontAwesome symbol;
         private Action clickAction;
-        private readonly float extraWidth;
         private Key triggerKey;
-        private string text;
         private SampleChannel sampleClick;
 
         public override bool Contains(Vector2 screenSpacePos)
@@ -47,12 +43,8 @@ namespace osu.Game.Screens.Menu
         public Button(string text, string internalName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
         {
             this.internalName = internalName;
-            this.symbol = symbol;
-            this.colour = colour;
             this.clickAction = clickAction;
-            this.extraWidth = extraWidth;
             this.triggerKey = triggerKey;
-            this.text = text;
 
             AutoSizeAxes = Axes.Both;
             Alpha = 0;
@@ -79,7 +71,7 @@ namespace osu.Game.Screens.Menu
                     Shear = new Vector2(ButtonSystem.WEDGE_WIDTH / boxSize.Y, 0),
                     Children = new []
                     {
-                        boxColourLayer = new Box
+                        new Box
                         {
                             EdgeSmoothness = new Vector2(1.5f, 0),
                             RelativeSizeAxes = Axes.Both,
@@ -107,6 +99,7 @@ namespace osu.Game.Screens.Menu
                         {
                             Shadow = true,
                             Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
                             TextSize = 30,
                             Position = new Vector2(0, 0),
                             Icon = symbol
@@ -232,9 +225,7 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            sampleClick = audio.Sample.Get($@"Menu/menu-{internalName}-click");
-            if (sampleClick == null)
-                sampleClick = audio.Sample.Get(internalName.Contains(@"back") ? @"Menu/menuback" : @"Menu/menuhit");
+            sampleClick = audio.Sample.Get($@"Menu/menu-{internalName}-click") ?? audio.Sample.Get(internalName.Contains(@"back") ? @"Menu/menuback" : @"Menu/menuhit");
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@@ -257,7 +248,8 @@ namespace osu.Game.Screens.Menu
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {
-            if (args.Repeat) return false;
+            if (args.Repeat || state.Keyboard.ControlPressed || state.Keyboard.ShiftPressed || state.Keyboard.AltPressed)
+                return false;
 
             if (triggerKey == args.Key && triggerKey != Key.Unknown)
             {
@@ -289,7 +281,7 @@ namespace osu.Game.Screens.Menu
 
         public int ContractStyle;
 
-        ButtonState state;
+        private ButtonState state;
 
         public ButtonState State
         {
@@ -320,12 +312,12 @@ namespace osu.Game.Screens.Menu
                     case ButtonState.Expanded:
                         const int expand_duration = 500;
                         box.ScaleTo(new Vector2(1, 1), expand_duration, EasingTypes.OutExpo);
-                        FadeIn(expand_duration / 6);
+                        FadeIn(expand_duration / 6f);
                         break;
                     case ButtonState.Exploded:
                         const int explode_duration = 200;
                         box.ScaleTo(new Vector2(2, 1), explode_duration, EasingTypes.OutExpo);
-                        FadeOut(explode_duration / 4 * 3);
+                        FadeOut(explode_duration / 4f * 3);
                         break;
                 }
             }
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index f26fded19d..7903062929 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -20,7 +19,7 @@ using OpenTK.Input;
 
 namespace osu.Game.Screens.Menu
 {
-    public partial class ButtonSystem : Container, IStateful<MenuState>
+    public class ButtonSystem : Container, IStateful<MenuState>
     {
         public Action OnEdit;
         public Action OnExit;
@@ -50,8 +49,8 @@ namespace osu.Game.Screens.Menu
         private Button backButton;
         private Button settingsButton;
 
-        List<Button> buttonsTopLevel = new List<Button>();
-        List<Button> buttonsPlay = new List<Button>();
+        private List<Button> buttonsTopLevel = new List<Button>();
+        private List<Button> buttonsPlay = new List<Button>();
 
         public ButtonSystem()
         {
@@ -78,7 +77,7 @@ namespace osu.Game.Screens.Menu
                         },
                         buttonFlow = new FlowContainerWithOrigin
                         {
-                            Direction = FillDirection.Right,
+                            Direction = FillDirection.Horizontal,
                             Spacing = new Vector2(-WEDGE_WIDTH, 0),
                             Anchor = Anchor.Centre,
                             AutoSizeAxes = Axes.Both,
@@ -188,7 +187,7 @@ namespace osu.Game.Screens.Menu
             }
         }
 
-        MenuState state;
+        private MenuState state;
 
         public override bool HandleInput => state != MenuState.Exit;
 
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index deb9a4dbf8..58e86bd069 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -13,7 +13,7 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Menu
 {
-    class Disclaimer : OsuScreen
+    internal class Disclaimer : OsuScreen
     {
         private Intro intro;
         private TextAwesome icon;
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Menu
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     Spacing = new Vector2(0, 2),
                     Children = new Drawable[]
                     {
diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs
index cf804de0f4..6d0cd4d821 100644
--- a/osu.Game/Screens/Menu/Intro.cs
+++ b/osu.Game/Screens/Menu/Intro.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Menu
         /// </summary>
         internal bool DidLoadMenu;
 
-        MainMenu mainMenu;
+        private MainMenu mainMenu;
         private SampleChannel welcome;
         private SampleChannel seeya;
         private Track bgm;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 3ef8eff457..7053face9d 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -13,13 +13,15 @@ using osu.Game.Screens.Direct;
 using osu.Game.Screens.Multiplayer;
 using OpenTK;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Tournament;
+using osu.Framework.Input;
+using OpenTK.Input;
 
 namespace osu.Game.Screens.Menu
 {
     public class MainMenu : OsuScreen
     {
         private ButtonSystem buttons;
-        public override string Name => @"Main Menu";
 
         internal override bool ShowOverlays => buttons.State != MenuState.Initial;
 
@@ -97,5 +99,16 @@ namespace osu.Game.Screens.Menu
             Content.FadeOut(3000);
             return base.OnExiting(next);
         }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (!args.Repeat && state.Keyboard.ControlPressed && state.Keyboard.ShiftPressed && args.Key == Key.D)
+            {
+                Push(new Drawings());
+                return true;
+            }
+
+            return base.OnKeyDown(state, args);
+        }
     }
 }
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 09e746f842..01622fe096 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Screens.Menu
                                     Origin = Anchor.Centre,
                                     Children = new Drawable[]
                                     {
-                                        ripple = new Sprite()
+                                        ripple = new Sprite
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multiplayer/Lobby.cs b/osu.Game/Screens/Multiplayer/Lobby.cs
index c6d59000d3..d34da46ec3 100644
--- a/osu.Game/Screens/Multiplayer/Lobby.cs
+++ b/osu.Game/Screens/Multiplayer/Lobby.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Screens.Multiplayer
 {
-    class Lobby : ScreenWhiteBox
+    internal class Lobby : ScreenWhiteBox
     {
         protected override IEnumerable<Type> PossibleChildren => new[] {
                 typeof(MatchCreate),
diff --git a/osu.Game/Screens/Multiplayer/Match.cs b/osu.Game/Screens/Multiplayer/Match.cs
index e4edcb5d7d..7da6ef800e 100644
--- a/osu.Game/Screens/Multiplayer/Match.cs
+++ b/osu.Game/Screens/Multiplayer/Match.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Multiplayer
 {
-    class Match : ScreenWhiteBox
+    internal class Match : ScreenWhiteBox
     {
         protected override IEnumerable<Type> PossibleChildren => new[] {
             typeof(MatchSongSelect),
diff --git a/osu.Game/Screens/Multiplayer/MatchCreate.cs b/osu.Game/Screens/Multiplayer/MatchCreate.cs
index 57dc0bcf4b..54800c82f3 100644
--- a/osu.Game/Screens/Multiplayer/MatchCreate.cs
+++ b/osu.Game/Screens/Multiplayer/MatchCreate.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Screens.Multiplayer
 {
-    class MatchCreate : ScreenWhiteBox
+    internal class MatchCreate : ScreenWhiteBox
     {
         protected override IEnumerable<Type> PossibleChildren => new[] {
                 typeof(Match)
diff --git a/osu.Game/Screens/Play/FailDialog.cs b/osu.Game/Screens/Play/FailDialog.cs
index 018cd72a9d..4bdd9d94d3 100644
--- a/osu.Game/Screens/Play/FailDialog.cs
+++ b/osu.Game/Screens/Play/FailDialog.cs
@@ -10,7 +10,7 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Play
 {
-    class FailDialog : OsuScreen
+    internal class FailDialog : OsuScreen
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
 
diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
index 00dd2393d1..20a8f73104 100644
--- a/osu.Game/Screens/Play/KeyCounter.cs
+++ b/osu.Game/Screens/Play/KeyCounter.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Screens.Play
         private Container textLayer;
         private SpriteText countSpriteText;
 
-        public override string Name { get; }
         public bool IsCounting { get; set; }
         private int count;
         public int Count
@@ -54,7 +53,7 @@ namespace osu.Game.Screens.Play
         //further: change default values here and in KeyCounterCollection if needed, instead of passing them in every constructor
         public Color4 KeyDownTextColor { get; set; } = Color4.DarkGray;
         public Color4 KeyUpTextColor { get; set; } = Color4.White;
-        public int FadeTime { get; set; } = 0;
+        public int FadeTime { get; set; }
 
         protected KeyCounter(string name)
         {
diff --git a/osu.Game/Screens/Play/KeyCounterCollection.cs b/osu.Game/Screens/Play/KeyCounterCollection.cs
index 0a93032a20..aa2bf47227 100644
--- a/osu.Game/Screens/Play/KeyCounterCollection.cs
+++ b/osu.Game/Screens/Play/KeyCounterCollection.cs
@@ -1,10 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Input;
 
 namespace osu.Game.Screens.Play
 {
@@ -12,7 +14,7 @@ namespace osu.Game.Screens.Play
     {
         public KeyCounterCollection()
         {
-            Direction = FillDirection.Right;
+            Direction = FillDirection.Horizontal;
             AutoSizeAxes = Axes.Both;
         }
 
@@ -49,7 +51,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private int fadeTime = 0;
+        private int fadeTime;
         public int FadeTime
         {
             get { return fadeTime; }
@@ -93,5 +95,37 @@ namespace osu.Game.Screens.Play
                 }
             }
         }
+
+        public override bool HandleInput => receptor?.IsAlive != true;
+
+        private Receptor receptor;
+
+        public Receptor GetReceptor()
+        {
+            return receptor ?? (receptor = new Receptor(this));
+        }
+
+        public class Receptor : Drawable
+        {
+            private KeyCounterCollection target;
+
+            public Receptor(KeyCounterCollection target)
+            {
+                RelativeSizeAxes = Axes.Both;
+                this.target = target;
+            }
+
+            public override bool Contains(Vector2 screenSpacePos) => true;
+
+            public override bool HandleInput => true;
+
+            protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) => target.Children.Any(c => c.TriggerKeyDown(state, args));
+
+            protected override bool OnKeyUp(InputState state, KeyUpEventArgs args) => target.Children.Any(c => c.TriggerKeyUp(state, args));
+
+            protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => target.Children.Any(c => c.TriggerMouseDown(state, args));
+
+            protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) => target.Children.Any(c => c.TriggerMouseUp(state, args));
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/KeyCounterKeyboard.cs b/osu.Game/Screens/Play/KeyCounterKeyboard.cs
index 79b75c47c8..3516dbbad8 100644
--- a/osu.Game/Screens/Play/KeyCounterKeyboard.cs
+++ b/osu.Game/Screens/Play/KeyCounterKeyboard.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Screens.Play
     public class KeyCounterKeyboard : KeyCounter
     {
         public Key Key { get; }
-        public KeyCounterKeyboard(string name, Key key) : base(name)
+        public KeyCounterKeyboard(Key key) : base(key.ToString())
         {
             Key = key;
         }
diff --git a/osu.Game/Screens/Play/KeyCounterMouse.cs b/osu.Game/Screens/Play/KeyCounterMouse.cs
index ad2ee54e2d..037d890a9e 100644
--- a/osu.Game/Screens/Play/KeyCounterMouse.cs
+++ b/osu.Game/Screens/Play/KeyCounterMouse.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Screens.Play
     public class KeyCounterMouse : KeyCounter
     {
         public MouseButton Button { get; }
-        public KeyCounterMouse(string name, MouseButton button) : base(name)
+        public KeyCounterMouse(MouseButton button) : base(button.ToString())
         {
             Button = button;
         }
diff --git a/osu.Game/Screens/Play/ModSelect.cs b/osu.Game/Screens/Play/ModSelect.cs
deleted file mode 100644
index 9d3db0221d..0000000000
--- a/osu.Game/Screens/Play/ModSelect.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Screens;
-using osu.Game.Screens.Backgrounds;
-using OpenTK.Graphics;
-
-namespace osu.Game.Screens.Play
-{
-    class ModSelect : ScreenWhiteBox
-    {
-        protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
-
-        protected override void OnEntering(Screen last)
-        {
-            base.OnEntering(last);
-            Background.Schedule(() => Background.FadeColour(Color4.DarkGray, 500));
-        }
-
-        protected override bool OnExiting(Screen next)
-        {
-            Background.Schedule(() => Background.FadeColour(Color4.White, 500));
-            return base.OnExiting(next);
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Pause/PauseProgressBar.cs b/osu.Game/Screens/Play/Pause/PauseProgressBar.cs
similarity index 96%
rename from osu.Game/Overlays/Pause/PauseProgressBar.cs
rename to osu.Game/Screens/Play/Pause/PauseProgressBar.cs
index bd32147e35..8d124706b1 100644
--- a/osu.Game/Overlays/Pause/PauseProgressBar.cs
+++ b/osu.Game/Screens/Play/Pause/PauseProgressBar.cs
@@ -1,15 +1,15 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
 using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Beatmaps;
+using OpenTK.Graphics;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play.Pause
 {
     public class PauseProgressBar : Container
     {
diff --git a/osu.Game/Overlays/Pause/PauseProgressGraph.cs b/osu.Game/Screens/Play/Pause/PauseProgressGraph.cs
similarity index 86%
rename from osu.Game/Overlays/Pause/PauseProgressGraph.cs
rename to osu.Game/Screens/Play/Pause/PauseProgressGraph.cs
index faee80a863..89b9b42b86 100644
--- a/osu.Game/Overlays/Pause/PauseProgressGraph.cs
+++ b/osu.Game/Screens/Play/Pause/PauseProgressGraph.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Graphics.Containers;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play.Pause
 {
     public class PauseProgressGraph : Container
     {
diff --git a/osu.Game/Overlays/Pause/QuitButton.cs b/osu.Game/Screens/Play/Pause/QuitButton.cs
similarity index 90%
rename from osu.Game/Overlays/Pause/QuitButton.cs
rename to osu.Game/Screens/Play/Pause/QuitButton.cs
index 18b7c4eda9..7b71b4b2fc 100644
--- a/osu.Game/Overlays/Pause/QuitButton.cs
+++ b/osu.Game/Screens/Play/Pause/QuitButton.cs
@@ -1,13 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using OpenTK.Graphics;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play.Pause
 {
     public class QuitButton : DialogButton
     {
diff --git a/osu.Game/Overlays/Pause/ResumeButton.cs b/osu.Game/Screens/Play/Pause/ResumeButton.cs
similarity index 91%
rename from osu.Game/Overlays/Pause/ResumeButton.cs
rename to osu.Game/Screens/Play/Pause/ResumeButton.cs
index a5179cb58a..d4f7555d3c 100644
--- a/osu.Game/Overlays/Pause/ResumeButton.cs
+++ b/osu.Game/Screens/Play/Pause/ResumeButton.cs
@@ -6,7 +6,7 @@ using osu.Framework.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play.Pause
 {
     public class ResumeButton : DialogButton
     {
diff --git a/osu.Game/Overlays/Pause/RetryButton.cs b/osu.Game/Screens/Play/Pause/RetryButton.cs
similarity index 91%
rename from osu.Game/Overlays/Pause/RetryButton.cs
rename to osu.Game/Screens/Play/Pause/RetryButton.cs
index ceab835915..8f660525c3 100644
--- a/osu.Game/Overlays/Pause/RetryButton.cs
+++ b/osu.Game/Screens/Play/Pause/RetryButton.cs
@@ -6,7 +6,7 @@ using osu.Framework.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play.Pause
 {
     public class RetryButton : DialogButton
     {
diff --git a/osu.Game/Overlays/Pause/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
similarity index 90%
rename from osu.Game/Overlays/Pause/PauseOverlay.cs
rename to osu.Game/Screens/Play/PauseOverlay.cs
index 5c85f3db9e..0f3303fc29 100644
--- a/osu.Game/Overlays/Pause/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -2,19 +2,21 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using OpenTK;
-using OpenTK.Input;
-using OpenTK.Graphics;
-using osu.Game.Graphics;
-using osu.Framework.Input;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
+using osu.Framework.Input;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Play.Pause;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Input;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play
 {
     public class PauseOverlay : OverlayContainer
     {
@@ -48,7 +50,7 @@ namespace osu.Game.Overlays.Pause
                         },
                         new OsuSpriteText
                         {
-                            Text = String.Format("{0:n0}", value),
+                            Text = $"{value:n0}",
                             Font = @"Exo2.0-Bold",
                             Shadow = true,
                             ShadowColour = new Color4(0, 0, 0, 0.25f),
@@ -56,7 +58,7 @@ namespace osu.Game.Overlays.Pause
                         },
                         new OsuSpriteText
                         {
-                            Text = $" time{((value == 1) ? "" : "s")} in this session",
+                            Text = $" time{(value == 1 ? "" : "s")} in this session",
                             Shadow = true,
                             ShadowColour = new Color4(0, 0, 0, 0.25f),
                             TextSize = 18
@@ -104,7 +106,7 @@ namespace osu.Game.Overlays.Pause
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     Spacing = new Vector2(0, 50),
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
@@ -112,11 +114,12 @@ namespace osu.Game.Overlays.Pause
                     {
                         new FillFlowContainer
                         {
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Down,
-                            Spacing = new Vector2(0, 20),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(0, 20),
                             Children = new Drawable[]
                             {
                                 new OsuSpriteText
@@ -143,6 +146,8 @@ namespace osu.Game.Overlays.Pause
                         },
                         new FillFlowContainer
                         {
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Masking = true,
@@ -187,9 +192,9 @@ namespace osu.Game.Overlays.Pause
                         },
                         retryCounterContainer = new FillFlowContainer
                         {
-                            AutoSizeAxes = Axes.Both,
                             Origin = Anchor.TopCentre,
-                            Anchor = Anchor.TopCentre
+                            Anchor = Anchor.TopCentre,
+                            AutoSizeAxes = Axes.Both,
                         }
                     }
                 },
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 0a094d2050..1a71543786 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1,62 +1,51 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using OpenTK;
+using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Timing;
-using osu.Game.Database;
-using osu.Game.Modes;
-using osu.Game.Modes.Objects.Drawables;
-using osu.Game.Screens.Backgrounds;
-using OpenTK;
-using osu.Framework.Screens;
-using osu.Game.Modes.UI;
-using osu.Game.Screens.Ranking;
-using osu.Game.Configuration;
-using osu.Game.Overlays.Pause;
-using osu.Framework.Configuration;
-using System;
-using System.Linq;
-using OpenTK.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transforms;
-using osu.Framework.Logging;
 using osu.Framework.Input;
+using osu.Framework.Logging;
+using osu.Framework.Screens;
+using osu.Framework.Timing;
+using osu.Game.Configuration;
+using osu.Game.Database;
+using osu.Game.Input.Handlers;
+using osu.Game.Modes;
+using osu.Game.Modes.UI;
+using osu.Game.Screens.Backgrounds;
+using osu.Game.Screens.Ranking;
+using System;
+using System.Linq;
 
 namespace osu.Game.Screens.Play
 {
     public class Player : OsuScreen
     {
-        public bool Autoplay;
-
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
 
         internal override bool ShowOverlays => false;
 
         public BeatmapInfo BeatmapInfo;
 
-        public PlayMode PreferredPlayMode;
-
-        private bool isPaused;
-        public bool IsPaused
-        {
-            get
-            {
-                return isPaused;
-            }
-        }
+        public bool IsPaused { get; private set; }
 
         public int RestartCount;
 
         private double pauseCooldown = 1000;
-        private double lastPauseActionTime = 0;
+        private double lastPauseActionTime;
 
-        private bool canPause => Time.Current >= (lastPauseActionTime + pauseCooldown);
+        private bool canPause => Time.Current >= lastPauseActionTime + pauseCooldown;
 
         private IAdjustableClock sourceClock;
+        private IFrameBasedClock interpolatedSourceClock;
 
         private Ruleset ruleset;
 
@@ -65,13 +54,23 @@ namespace osu.Game.Screens.Play
         private Bindable<int> dimLevel;
         private SkipButton skipButton;
 
-        private ScoreOverlay scoreOverlay;
+        private HudOverlay hudOverlay;
         private PauseOverlay pauseOverlay;
-        private PlayerInputManager playerInputManager;
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuGameBase game, OsuConfigManager config)
+        private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuConfigManager config)
         {
+            var beatmap = Beatmap.Beatmap;
+
+            if (beatmap.BeatmapInfo?.Mode > PlayMode.Osu)
+            {
+                //we only support osu! mode for now because the hitobject parsing is crappy and needs a refactor.
+                Exit();
+                return;
+            }
+
+            Beatmap.Mods.Value.ForEach(m => m.PlayerLoading(this));
+
             dimLevel = config.GetBindable<int>(OsuConfig.DimLevel);
             mouseWheelDisabled = config.GetBindable<bool>(OsuConfig.MouseDisableWheel);
 
@@ -82,6 +81,9 @@ namespace osu.Game.Screens.Play
 
                 if ((Beatmap?.Beatmap?.HitObjects.Count ?? 0) == 0)
                     throw new Exception("No valid objects were found!");
+
+                if (Beatmap == null)
+                    throw new Exception("Beatmap was not loaded");
             }
             catch (Exception e)
             {
@@ -101,27 +103,18 @@ namespace osu.Game.Screens.Play
             }
 
             sourceClock = (IAdjustableClock)track ?? new StopwatchClock();
+            interpolatedSourceClock = new InterpolatingFramedClock(sourceClock);
 
             Schedule(() =>
             {
                 sourceClock.Reset();
             });
 
-            var beatmap = Beatmap.Beatmap;
+            ruleset = Ruleset.GetRuleset(Beatmap.PlayMode);
 
-            if (beatmap.BeatmapInfo?.Mode > PlayMode.Osu)
-            {
-                //we only support osu! mode for now because the hitobject parsing is crappy and needs a refactor.
-                Exit();
-                return;
-            }
-
-            PlayMode usablePlayMode = beatmap.BeatmapInfo?.Mode > PlayMode.Osu ? beatmap.BeatmapInfo.Mode : PreferredPlayMode;
-
-            ruleset = Ruleset.GetRuleset(usablePlayMode);
-
-            scoreOverlay = ruleset.CreateScoreOverlay();
-            scoreOverlay.BindProcessor(scoreProcessor = ruleset.CreateScoreProcessor(beatmap.HitObjects.Count));
+            hudOverlay = new StandardHudOverlay();
+            hudOverlay.KeyCounter.Add(ruleset.CreateGameplayKeys());
+            hudOverlay.BindProcessor(scoreProcessor = ruleset.CreateScoreProcessor(beatmap.HitObjects.Count));
 
             pauseOverlay = new PauseOverlay
             {
@@ -137,6 +130,14 @@ namespace osu.Game.Screens.Play
 
             hitRenderer = ruleset.CreateHitRendererWith(beatmap);
 
+            if (ReplayInputHandler != null)
+            {
+                ReplayInputHandler.ToScreenSpace = hitRenderer.MapPlayfieldToScreenSpace;
+                hitRenderer.InputManager.ReplayInputHandler = ReplayInputHandler;
+            }
+
+            hudOverlay.BindHitRenderer(hitRenderer);
+
             //bind HitRenderer to ScoreProcessor and ourselves (for a pass situation)
             hitRenderer.OnJudgement += scoreProcessor.AddJudgement;
             hitRenderer.OnAllJudged += onPass;
@@ -144,21 +145,22 @@ namespace osu.Game.Screens.Play
             //bind ScoreProcessor to ourselves (for a fail situation)
             scoreProcessor.Failed += onFail;
 
-            if (Autoplay)
-                hitRenderer.Schedule(() => hitRenderer.DrawableObjects.ForEach(h => h.State = ArmedState.Hit));
-
             Children = new Drawable[]
             {
-                playerInputManager = new PlayerInputManager(game.Host)
+                new Container
                 {
-                    Clock = new InterpolatingFramedClock(sourceClock),
+                    RelativeSizeAxes = Axes.Both,
+                    Clock = interpolatedSourceClock,
                     Children = new Drawable[]
                     {
                         hitRenderer,
-                        skipButton = new SkipButton { Alpha = 0 },
+                        skipButton = new SkipButton
+                        {
+                            Alpha = 0
+                        },
                     }
                 },
-                scoreOverlay,
+                hudOverlay,
                 pauseOverlay
             };
         }
@@ -195,30 +197,30 @@ namespace osu.Game.Screens.Play
             if (canPause || force)
             {
                 lastPauseActionTime = Time.Current;
-                scoreOverlay.KeyCounter.IsCounting = false;
+                hudOverlay.KeyCounter.IsCounting = false;
                 pauseOverlay.Retries = RestartCount;
                 pauseOverlay.Show();
                 sourceClock.Stop();
-                isPaused = true;
+                IsPaused = true;
             }
             else
             {
-                isPaused = false;
+                IsPaused = false;
             }
         }
 
         public void Resume()
         {
             lastPauseActionTime = Time.Current;
-            scoreOverlay.KeyCounter.IsCounting = true;
+            hudOverlay.KeyCounter.IsCounting = true;
             pauseOverlay.Hide();
             sourceClock.Start();
-            isPaused = false;
+            IsPaused = false;
         }
 
         public void TogglePaused()
         {
-            isPaused = !IsPaused;
+            IsPaused = !IsPaused;
             if (IsPaused) Pause(); else Resume();
         }
 
@@ -303,6 +305,8 @@ namespace osu.Game.Screens.Play
         {
             if (pauseOverlay == null) return false;
 
+            if (ReplayInputHandler != null) return false;
+
             if (pauseOverlay.State != Visibility.Visible && !canPause) return true;
 
             if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map
@@ -328,6 +332,8 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> mouseWheelDisabled;
 
-        protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !isPaused;
+        public ReplayInputHandler ReplayInputHandler;
+
+        protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !IsPaused;
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Screens/Play/PlayerInputManager.cs b/osu.Game/Screens/Play/PlayerInputManager.cs
index 181cd68da9..a16c1ba9c6 100644
--- a/osu.Game/Screens/Play/PlayerInputManager.cs
+++ b/osu.Game/Screens/Play/PlayerInputManager.cs
@@ -1,46 +1,72 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Input;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Input;
-using osu.Framework.Platform;
 using osu.Game.Configuration;
 using System.Linq;
+using osu.Framework.Timing;
+using osu.Game.Input.Handlers;
+using OpenTK.Input;
+using KeyboardState = osu.Framework.Input.KeyboardState;
+using MouseState = osu.Framework.Input.MouseState;
 
 namespace osu.Game.Screens.Play
 {
-    class PlayerInputManager : UserInputManager
+    public class PlayerInputManager : PassThroughInputManager
     {
-        public PlayerInputManager(GameHost host)
-            : base(host)
+        private bool leftViaKeyboard;
+        private bool rightViaKeyboard;
+        private Bindable<bool> mouseDisabled;
+
+        private ManualClock clock = new ManualClock();
+        private IFrameBasedClock parentClock;
+
+        private ReplayInputHandler replayInputHandler;
+        public ReplayInputHandler ReplayInputHandler
         {
+            get { return replayInputHandler; }
+            set
+            {
+                if (replayInputHandler != null) RemoveHandler(replayInputHandler);
+
+                replayInputHandler = value;
+                UseParentState = replayInputHandler == null;
+
+                if (replayInputHandler != null)
+                    AddHandler(replayInputHandler);
+            }
         }
 
-        bool leftViaKeyboard;
-        bool rightViaKeyboard;
-        Bindable<bool> mouseDisabled;
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            parentClock = Clock;
+            Clock = new FramedClock(clock);
+        }
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            mouseDisabled = config.GetBindable<bool>(OsuConfig.MouseDisableButtons)
-                ?? new Bindable<bool>(false);
+            mouseDisabled = config.GetBindable<bool>(OsuConfig.MouseDisableButtons);
         }
 
         protected override void TransformState(InputState state)
         {
             base.TransformState(state);
 
-            if (state.Keyboard != null)
+            var mouse = state.Mouse as MouseState;
+            var keyboard = state.Keyboard as KeyboardState;
+
+            if (keyboard != null)
             {
-                leftViaKeyboard = state.Keyboard.Keys.Contains(Key.Z);
-                rightViaKeyboard = state.Keyboard.Keys.Contains(Key.X);
+                leftViaKeyboard = keyboard.Keys.Contains(Key.Z);
+                rightViaKeyboard = keyboard.Keys.Contains(Key.X);
             }
 
-            var mouse = (Framework.Input.MouseState)state.Mouse;
-            if (state.Mouse != null)
+            if (mouse != null)
             {
                 if (mouseDisabled.Value)
                 {
@@ -54,5 +80,38 @@ namespace osu.Game.Screens.Play
                     mouse.ButtonStates.Find(s => s.Button == MouseButton.Right).State = true;
             }
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (parentClock == null) return;
+
+            clock.Rate = parentClock.Rate;
+            clock.IsRunning = parentClock.IsRunning;
+
+            //if a replayHandler is not attached, we should just pass-through.
+            if (UseParentState || replayInputHandler == null)
+            {
+                clock.CurrentTime = parentClock.CurrentTime;
+                base.Update();
+                return;
+            }
+
+            while (true)
+            {
+                double? newTime = replayInputHandler.SetFrameFromTime(parentClock.CurrentTime);
+
+                if (newTime == null)
+                    //we shouldn't execute for this time value
+                    break;
+
+                if (clock.CurrentTime == parentClock.CurrentTime)
+                    break;
+
+                clock.CurrentTime = newTime.Value;
+                base.Update();
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index bc04dbb2f7..98e08afdb9 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -95,9 +95,9 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
-        class BeatmapMetadataDisplay : Container
+        private class BeatmapMetadataDisplay : Container
         {
-            class MetadataLine : Container
+            private class MetadataLine : Container
             {
                 public MetadataLine(string left, string right)
                 {
@@ -131,12 +131,12 @@ namespace osu.Game.Screens.Play
                 AutoSizeAxes = Axes.Both;
                 Children = new Drawable[]
                 {
-                    new FillFlowContainer()
+                    new FillFlowContainer
                     {
                         AutoSizeAxes = Axes.Both,
                         Origin = Anchor.TopCentre,
                         Anchor = Anchor.TopCentre,
-                        Direction = FillDirection.Down,
+                        Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
                             new OsuSpriteText
@@ -167,7 +167,7 @@ namespace osu.Game.Screens.Play
                                 {
                                     new Sprite
                                     {
-                                        Texture = beatmap.Background,
+                                        Texture = beatmap?.Background,
                                         Origin = Anchor.Centre,
                                         Anchor = Anchor.Centre,
                                         FillMode = FillMode.Fill,
@@ -176,7 +176,7 @@ namespace osu.Game.Screens.Play
                             },
                             new OsuSpriteText
                             {
-                                Text = beatmap.BeatmapInfo?.Version,
+                                Text = beatmap?.BeatmapInfo?.Version,
                                 TextSize = 26,
                                 Font = @"Exo2.0-MediumItalic",
                                 Origin = Anchor.TopCentre,
diff --git a/osu.Game/Screens/Ranking/Results.cs b/osu.Game/Screens/Ranking/Results.cs
index 1c8972e4be..2df654b889 100644
--- a/osu.Game/Screens/Ranking/Results.cs
+++ b/osu.Game/Screens/Ranking/Results.cs
@@ -13,13 +13,13 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Ranking
 {
-    class Results : OsuScreen
+    internal class Results : OsuScreen
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
 
         private static readonly Vector2 background_blur = new Vector2(20);
 
-        ScoreDisplay scoreDisplay;
+        private ScoreDisplay scoreDisplay;
 
         protected override void OnEntering(Screen last)
         {
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Ranking
         }
     }
 
-    class ScoreDisplay : Container
+    internal class ScoreDisplay : Container
     {
         public ScoreDisplay(Score s)
         {
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Ranking
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
                         new OsuSpriteText
diff --git a/osu.Game/Screens/Select/BeatmapDeleteDialog.cs b/osu.Game/Screens/Select/BeatmapDeleteDialog.cs
index a8216d3e4e..e6e9a86124 100644
--- a/osu.Game/Screens/Select/BeatmapDeleteDialog.cs
+++ b/osu.Game/Screens/Select/BeatmapDeleteDialog.cs
@@ -8,7 +8,7 @@ using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Dialog;
 
-namespace osu.Game
+namespace osu.Game.Screens.Select
 {
     public class BeatmapDeleteDialog : PopupDialog
     {
@@ -22,9 +22,11 @@ namespace osu.Game
 
         public BeatmapDeleteDialog(WorkingBeatmap beatmap)
         {
+            if (beatmap == null) throw new ArgumentNullException(nameof(beatmap));
+
             Icon = FontAwesome.fa_trash_o;
             HeaderText = @"Confirm deletion of";
-            BodyText = $@"{beatmap?.Beatmap?.Metadata?.Artist} - {beatmap?.Beatmap?.Metadata?.Title}";
+            BodyText = $@"{beatmap.Beatmap?.Metadata?.Artist} - {beatmap.Beatmap?.Metadata?.Title}";
             Buttons = new PopupDialogButton[]
             {
                 new PopupDialogOkButton
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index a3493971cb..bc3b16079c 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -23,7 +24,7 @@ using osu.Game.Modes;
 
 namespace osu.Game.Screens.Select
 {
-    class BeatmapInfoWedge : Container
+    internal class BeatmapInfoWedge : Container
     {
         private static readonly Vector2 wedged_container_shear = new Vector2(0.15f, 0);
 
@@ -54,7 +55,7 @@ namespace osu.Game.Screens.Select
 
         public void UpdateBeatmap(WorkingBeatmap beatmap)
         {
-            if (beatmap == null)
+            if (beatmap?.BeatmapInfo == null)
                 return;
 
             var lastContainer = beatmapInfoContainer;
@@ -125,7 +126,7 @@ namespace osu.Game.Screens.Select
                     {
                         Anchor = Anchor.BottomLeft,
                         Origin = Anchor.BottomLeft,
-                        Direction = FillDirection.Down,
+                        Direction = FillDirection.Vertical,
                         Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 },
                         AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
@@ -147,7 +148,7 @@ namespace osu.Game.Screens.Select
                             new FillFlowContainer
                             {
                                 Margin = new MarginPadding { Top = 10 },
-                                Direction = FillDirection.Right,
+                                Direction = FillDirection.Horizontal,
                                 AutoSizeAxes = Axes.Both,
                                 Children = new []
                                 {
@@ -208,12 +209,14 @@ namespace osu.Game.Screens.Select
                     new TextAwesome
                     {
                         Icon = FontAwesome.fa_square,
+                        Origin = Anchor.Centre,
                         Colour = new Color4(68, 17, 136, 255),
                         Rotation = 45
                     },
                     new TextAwesome
                     {
                         Icon = statistic.Icon,
+                        Origin = Anchor.Centre,
                         Colour = new Color4(255, 221, 85, 255),
                         Scale = new Vector2(0.8f)
                     },
diff --git a/osu.Game/Screens/Select/CarouselContainer.cs b/osu.Game/Screens/Select/CarouselContainer.cs
index bb391c2eb7..e7fba05036 100644
--- a/osu.Game/Screens/Select/CarouselContainer.cs
+++ b/osu.Game/Screens/Select/CarouselContainer.cs
@@ -9,87 +9,46 @@ using osu.Game.Database;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Lists;
 using osu.Game.Beatmaps.Drawables;
-using osu.Framework.Timing;
 using osu.Framework.Input;
 using OpenTK.Input;
 using System.Collections;
 using osu.Framework.MathUtils;
+using System.Diagnostics;
 
 namespace osu.Game.Screens.Select
 {
-    class CarouselContainer : ScrollContainer, IEnumerable<BeatmapGroup>
+    internal class CarouselContainer : ScrollContainer, IEnumerable<BeatmapGroup>
     {
         private Container<Panel> scrollableContent;
         private List<BeatmapGroup> groups = new List<BeatmapGroup>();
+        private List<Panel> panels = new List<Panel>();
 
         public BeatmapGroup SelectedGroup { get; private set; }
         public BeatmapPanel SelectedPanel { get; private set; }
 
         private List<float> yPositions = new List<float>();
-        private CarouselLifetimeList<Panel> lifetime;
 
         public CarouselContainer()
         {
             DistanceDecayJump = 0.01;
 
-            Add(scrollableContent = new Container<Panel>(lifetime = new CarouselLifetimeList<Panel>(DepthComparer))
+            Add(scrollableContent = new Container<Panel>
             {
                 RelativeSizeAxes = Axes.X,
             });
         }
 
-        internal class CarouselLifetimeList<T> : LifetimeList<Panel>
-        {
-            public CarouselLifetimeList(IComparer<Panel> comparer)
-                : base(comparer)
-            {
-            }
-
-            public int StartIndex;
-            public int EndIndex;
-
-            public override bool Update(FrameTimeInfo time)
-            {
-                bool anyAliveChanged = false;
-
-                //check existing items to make sure they haven't died.
-                foreach (var item in AliveItems.ToArray())
-                {
-                    item.UpdateTime(time);
-                    if (!item.IsAlive)
-                    {
-                        //todo: make this more efficient
-                        int i = IndexOf(item);
-                        anyAliveChanged |= CheckItem(item, ref i);
-                    }
-                }
-
-                //handle custom range
-                for (int i = StartIndex; i < EndIndex; i++)
-                {
-                    var item = this[i];
-                    item.UpdateTime(time);
-                    anyAliveChanged |= CheckItem(item, ref i);
-                }
-
-                return anyAliveChanged;
-            }
-        }
-
         public void AddGroup(BeatmapGroup group)
         {
-            group.State = BeatmapGroupState.Collapsed;
             groups.Add(group);
 
-            group.Header.Depth = -scrollableContent.Children.Count();
-            scrollableContent.Add(group.Header);
-
+            panels.Add(group.Header);
+            group.Header.UpdateClock(Clock);
             foreach (BeatmapPanel panel in group.BeatmapPanels)
             {
-                panel.Depth = -scrollableContent.Children.Count();
-                scrollableContent.Add(panel);
+                panels.Add(panel);
+                panel.UpdateClock(Clock);
             }
 
             computeYPositions();
@@ -98,6 +57,9 @@ namespace osu.Game.Screens.Select
         public void RemoveGroup(BeatmapGroup group)
         {
             groups.Remove(group);
+            foreach (var p in group.BeatmapPanels)
+                panels.Remove(p);
+
             scrollableContent.Remove(group.Header);
             scrollableContent.Remove(group.BeatmapPanels);
 
@@ -107,7 +69,7 @@ namespace osu.Game.Screens.Select
         private void movePanel(Panel panel, bool advance, bool animated, ref float currentY)
         {
             yPositions.Add(currentY);
-            panel.MoveToY(currentY, animated && (panel.IsOnScreen || panel.State != PanelSelectedState.Hidden) ? 750 : 0, EasingTypes.OutExpo);
+            panel.MoveToY(currentY, animated ? 750 : 0, EasingTypes.OutExpo);
 
             if (advance)
                 currentY += panel.DrawHeight + 5;
@@ -172,14 +134,16 @@ namespace osu.Game.Screens.Select
                 var panel = group.BeatmapPanels.FirstOrDefault(p => p.Beatmap.Equals(beatmap));
                 if (panel != null)
                 {
-                    SelectGroup(group, panel, animated);
+                    selectGroup(group, panel, animated);
                     return;
                 }
             }
         }
 
-        public void SelectGroup(BeatmapGroup group, BeatmapPanel panel, bool animated = true)
+        private void selectGroup(BeatmapGroup group, BeatmapPanel panel, bool animated = true)
         {
+            Trace.Assert(group.BeatmapPanels.Contains(panel), @"Selected panel must be in provided group");
+
             if (SelectedGroup != null && SelectedGroup != group && SelectedGroup.State != BeatmapGroupState.Hidden)
                 SelectedGroup.State = BeatmapGroupState.Collapsed;
 
@@ -192,29 +156,34 @@ namespace osu.Game.Screens.Select
             ScrollTo(selectedY, animated);
         }
 
-        public void Sort(FilterControl.SortMode mode) {
-            switch (mode) { 
+        public void Sort(FilterControl.SortMode mode)
+        {
+            List<BeatmapGroup> sortedGroups = new List<BeatmapGroup>(groups);
+            switch (mode)
+            {
                 case FilterControl.SortMode.Artist:
-                    groups.Sort((x, y) => string.Compare(x.BeatmapSet.Metadata.Artist, y.BeatmapSet.Metadata.Artist));
+                    sortedGroups.Sort((x, y) => string.Compare(x.BeatmapSet.Metadata.Artist, y.BeatmapSet.Metadata.Artist, StringComparison.InvariantCultureIgnoreCase));
                     break;
                 case FilterControl.SortMode.Title:
-                    groups.Sort((x, y) => string.Compare(x.BeatmapSet.Metadata.Title, y.BeatmapSet.Metadata.Title));
+                    sortedGroups.Sort((x, y) => string.Compare(x.BeatmapSet.Metadata.Title, y.BeatmapSet.Metadata.Title, StringComparison.InvariantCultureIgnoreCase));
                     break;
                 case FilterControl.SortMode.Author:
-                    groups.Sort((x, y) => string.Compare(x.BeatmapSet.Metadata.Author, y.BeatmapSet.Metadata.Author));
+                    sortedGroups.Sort((x, y) => string.Compare(x.BeatmapSet.Metadata.Author, y.BeatmapSet.Metadata.Author, StringComparison.InvariantCultureIgnoreCase));
                     break;
                 case FilterControl.SortMode.Difficulty:
-                    groups.Sort((x, y) =>
+                    sortedGroups.Sort((x, y) =>
                     {
-                        float xAverage=0, yAverage=0;
-                        int counter=0;
-                        foreach (BeatmapInfo set in x.BeatmapSet.Beatmaps) {
+                        float xAverage = 0, yAverage = 0;
+                        int counter = 0;
+                        foreach (BeatmapInfo set in x.BeatmapSet.Beatmaps)
+                        {
                             xAverage += set.StarDifficulty;
                             counter++;
                         }
                         xAverage /= counter;
                         counter = 0;
-                        foreach (BeatmapInfo set in y.BeatmapSet.Beatmaps) {
+                        foreach (BeatmapInfo set in y.BeatmapSet.Beatmaps)
+                        {
                             yAverage += set.StarDifficulty;
                             counter++;
                         }
@@ -228,22 +197,23 @@ namespace osu.Game.Screens.Select
                 default:
                     throw new NotImplementedException();
             }
-            scrollableContent.Clear(false);
-            lifetime.Clear();
-            foreach (BeatmapGroup group in groups)
-            {
-                group.Header.Depth = -scrollableContent.Children.Count();
-                scrollableContent.Add(group.Header);
 
-                foreach (BeatmapPanel panel in group.BeatmapPanels)
-                {
-                    panel.Depth = -scrollableContent.Children.Count();
-                    scrollableContent.Add(panel);
-                }
-            }
-            SelectGroup(groups.FirstOrDefault(), groups.First().BeatmapPanels.FirstOrDefault());
+            scrollableContent.Clear(false);
+            panels.Clear();
+            groups.Clear();
+
+            foreach (BeatmapGroup group in sortedGroups)
+                AddGroup(group);
         }
 
+        /// <summary>
+        /// Computes the x-offset of currently visible panels. Makes the carousel appear round.
+        /// </summary>
+        /// <param name="dist">
+        /// Vertical distance from the center of the carousel container
+        /// ranging from -1 to 1.
+        /// </param>
+        /// <param name="halfHeight">Half the height of the carousel container.</param>
         private static float offsetX(float dist, float halfHeight)
         {
             // The radius of the circle the carousel moves on.
@@ -282,34 +252,46 @@ namespace osu.Game.Screens.Select
         {
             base.Update();
 
-            // Determine which items stopped being on screen for future removal from the lifetimelist.
             float drawHeight = DrawHeight;
-            float halfHeight = drawHeight / 2;
 
-            foreach (Panel p in lifetime.AliveItems)
+            // Remove all panels that should no longer be on-screen
+            scrollableContent.RemoveAll(delegate (Panel p)
             {
                 float panelPosY = p.Position.Y;
-                p.IsOnScreen = panelPosY >= Current - p.DrawHeight && panelPosY <= Current + drawHeight;
-                updatePanel(p, halfHeight);
-            }
+                bool remove = panelPosY < Current - p.DrawHeight || panelPosY > Current + drawHeight || !p.IsPresent;
+                return remove;
+            });
+
+            // Find index range of all panels that should be on-screen
+            Trace.Assert(panels.Count == yPositions.Count);
 
-            // Determine range of indices for items that are now definitely on screen to be added
-            // to the lifetimelist in the future.
             int firstIndex = yPositions.BinarySearch(Current - Panel.MAX_HEIGHT);
             if (firstIndex < 0) firstIndex = ~firstIndex;
             int lastIndex = yPositions.BinarySearch(Current + drawHeight);
             if (lastIndex < 0) lastIndex = ~lastIndex;
 
-            lifetime.StartIndex = firstIndex;
-            lifetime.EndIndex = lastIndex;
-
+            // Add those panels within the previously found index range that should be displayed.
             for (int i = firstIndex; i < lastIndex; ++i)
             {
-                Panel p = lifetime[i];
-                if (p.State != PanelSelectedState.Hidden)
-                    p.IsOnScreen = true; //we don't want to update the on-screen state of hidden pannels as they have incorrect (stacked) y values.
-                updatePanel(p, halfHeight);
+                Panel panel = panels[i];
+                if (panel.State == PanelSelectedState.Hidden)
+                    continue;
+
+                // Only add if we're not already part of the content.
+                if (!scrollableContent.Contains(panel))
+                {
+                    // Makes sure headers are always _below_ panels,
+                    // and depth flows downward.
+                    panel.Depth = i + (panel is BeatmapSetHeader ? panels.Count : 0);
+                    scrollableContent.Add(panel);
+                }
             }
+
+            // Update externally controlled state of currently visible panels
+            // (e.g. x-offset and opacity).
+            float halfHeight = drawHeight / 2;
+            foreach (Panel p in scrollableContent.Children)
+                updatePanel(p, halfHeight);
         }
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
@@ -344,14 +326,14 @@ namespace osu.Game.Screens.Select
 
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
-            if (!skipDifficulties)
+            if (!skipDifficulties && SelectedGroup != null)
             {
                 int i = SelectedGroup.BeatmapPanels.IndexOf(SelectedPanel) + direction;
 
                 if (i >= 0 && i < SelectedGroup.BeatmapPanels.Count)
                 {
                     //changing difficulty panel, not set.
-                    SelectGroup(SelectedGroup, SelectedGroup.BeatmapPanels[i]);
+                    selectGroup(SelectedGroup, SelectedGroup.BeatmapPanels[i]);
                     return;
                 }
             }
@@ -372,13 +354,16 @@ namespace osu.Game.Screens.Select
 
         public void SelectRandom()
         {
-            if (groups.Count < 1)
+            List<BeatmapGroup> visibleGroups = groups.Where(selectGroup => selectGroup.State != BeatmapGroupState.Hidden).ToList();
+            if (visibleGroups.Count < 1)
                 return;
-            BeatmapGroup group = groups[RNG.Next(groups.Count)];
+            BeatmapGroup group = visibleGroups[RNG.Next(visibleGroups.Count)];
             BeatmapPanel panel = group?.BeatmapPanels.First();
+
             if (panel == null)
                 return;
-            SelectGroup(group, panel);
+
+            selectGroup(group, panel);
         }
 
         public IEnumerator<BeatmapGroup> GetEnumerator() => groups.GetEnumerator();
diff --git a/osu.Game/Screens/Select/EditSongSelect.cs b/osu.Game/Screens/Select/EditSongSelect.cs
index 5eaaf1be64..4d07de2de8 100644
--- a/osu.Game/Screens/Select/EditSongSelect.cs
+++ b/osu.Game/Screens/Select/EditSongSelect.cs
@@ -8,7 +8,7 @@ using osu.Game.Screens.Edit;
 
 namespace osu.Game.Screens.Select
 {
-    class EditSongSelect : ScreenWhiteBox
+    internal class EditSongSelect : ScreenWhiteBox
     {
         protected override IEnumerable<Type> PossibleChildren => new[] {
                 typeof(Editor)
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index fd7992ba16..e20c170e3f 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -55,12 +54,12 @@ namespace osu.Game.Screens.Select
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     Width = 0.4f, // TODO: InnerWidth property or something
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
                         searchTextBox = new SearchTextBox {
                             RelativeSizeAxes = Axes.X,
-                            OnChange = (TextBox sender, bool newText) =>
+                            OnChange = (sender, newText) =>
                             {
                                 if (newText)
                                     FilterChanged?.Invoke();
@@ -188,7 +187,7 @@ namespace osu.Game.Screens.Select
                     new FillFlowContainer
                     {
                         AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Right,
+                        Direction = FillDirection.Horizontal,
                         Spacing = new Vector2(10, 0),
                         Children = new Drawable[]
                         {
@@ -210,17 +209,16 @@ namespace osu.Game.Screens.Select
                             groupsEllipsis = new TextAwesome
                             {
                                 Icon = FontAwesome.fa_ellipsis_h,
+                                Origin = Anchor.TopLeft,
                                 TextSize = 14,
                                 Margin = new MarginPadding { Top = 5, Bottom = 5 },
-                                Origin = Anchor.BottomLeft,
-                                Anchor = Anchor.BottomLeft,
                             }
                         }
                     },
                     new FillFlowContainer
                     {
                         AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Right,
+                        Direction = FillDirection.Horizontal,
                         Spacing = new Vector2(10, 0),
                         Origin = Anchor.TopRight,
                         Anchor = Anchor.TopRight,
@@ -241,10 +239,9 @@ namespace osu.Game.Screens.Select
                             sortEllipsis = new TextAwesome
                             {
                                 Icon = FontAwesome.fa_ellipsis_h,
+                                Origin = Anchor.TopLeft,
                                 TextSize = 14,
                                 Margin = new MarginPadding { Top = 5, Bottom = 5 },
-                                Origin = Anchor.BottomLeft,
-                                Anchor = Anchor.BottomLeft,
                             }
                         }
                     },
diff --git a/osu.Game/Screens/Select/Footer.cs b/osu.Game/Screens/Select/Footer.cs
index 2b62e8d452..4af72cecd9 100644
--- a/osu.Game/Screens/Select/Footer.cs
+++ b/osu.Game/Screens/Select/Footer.cs
@@ -4,11 +4,11 @@
 using System;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Menu;
 
@@ -95,16 +95,16 @@ namespace osu.Game.Screens.Select
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
-                    Position = new Vector2(BackButton.SIZE_EXTENDED.X + padding, 0),
+                    Position = new Vector2(TwoLayerButton.SIZE_EXTENDED.X + padding, 0),
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
-                    Direction = FillDirection.Right,
+                    Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(padding, 0),
                     Children = new Drawable[]
                     {
                         buttons = new FillFlowContainer
                         {
-                            Direction = FillDirection.Right,
+                            Direction = FillDirection.Horizontal,
                             Spacing = new Vector2(0.2f, 0),
                             AutoSizeAxes = Axes.Both,
                         }
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 4c9e7c9d37..5be41edd23 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -5,7 +5,7 @@ using osu.Game.Screens.Backgrounds;
 
 namespace osu.Game.Screens.Select
 {
-    class MatchSongSelect : ScreenWhiteBox
+    internal class MatchSongSelect : ScreenWhiteBox
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
     }
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
new file mode 100644
index 0000000000..32901ad919
--- /dev/null
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
@@ -0,0 +1,153 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
+using osu.Framework.Input;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Select.Options
+{
+    public class BeatmapOptionsButton : ClickableContainer
+    {
+        private static readonly float width = 130;
+
+        private Box background, flash;
+        private TextAwesome iconText;
+        private OsuSpriteText firstLine, secondLine;
+        private Container box;
+
+        public Color4 ButtonColour
+        {
+            get { return background.Colour; }
+            set { background.Colour = value; }
+        }
+
+        public FontAwesome Icon
+        {
+            get { return iconText.Icon; }
+            set { iconText.Icon = value; }
+        }
+
+        public string FirstLineText
+        {
+            get { return firstLine.Text; }
+            set { firstLine.Text = value; }
+        }
+
+        public string SecondLineText
+        {
+            get { return secondLine.Text; }
+            set { secondLine.Text = value; }
+        }
+
+        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+        {
+            flash.FadeTo(0.1f, 1000, EasingTypes.OutQuint);
+            return base.OnMouseDown(state, args);
+        }
+
+        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
+        {
+            flash.FadeTo(0, 1000, EasingTypes.OutQuint);
+            return base.OnMouseUp(state, args);
+        }
+
+        protected override bool OnClick(InputState state)
+        {
+            flash.ClearTransforms();
+            flash.Alpha = 0.9f;
+            flash.FadeOut(800, EasingTypes.OutExpo);
+
+            return base.OnClick(state);
+        }
+
+        public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
+
+        public BeatmapOptionsButton()
+        {
+            Width = width;
+            RelativeSizeAxes = Axes.Y;
+
+            Children = new Drawable[]
+            {
+                box = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Shear = new Vector2(0.2f, 0f),
+                    Masking = true,
+                    EdgeEffect = new EdgeEffect
+                    {
+                        Type = EdgeEffectType.Shadow,
+                        Colour = Color4.Black.Opacity(0.2f),
+                        Roundness = 5,
+                        Radius = 8,
+                    },
+                    Children = new Drawable[]
+                    {
+                        background = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            EdgeSmoothness = new Vector2(1.5f, 0),
+                            Colour = Color4.Black,
+                        },
+                        flash = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            EdgeSmoothness = new Vector2(1.5f, 0),
+                            BlendingMode = BlendingMode.Additive,
+                            Colour = Color4.White,
+                            Alpha = 0,
+                        },
+                    },
+                },
+                new FillFlowContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        iconText = new TextAwesome
+                        {
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            TextSize = 30,
+                            Shadow = true,
+                            Icon = FontAwesome.fa_close,
+                            Margin = new MarginPadding
+                            {
+                                Bottom = 5,
+                            },
+                        },
+                        firstLine = new OsuSpriteText
+                        {
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            Font = @"Exo2.0-Bold",
+                            Text = @"",
+                        },
+                        secondLine = new OsuSpriteText
+                        {
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            Font = @"Exo2.0-Bold",
+                            Text = @"",
+                        },
+                    },
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsClearLocalScoresButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsClearLocalScoresButton.cs
new file mode 100644
index 0000000000..66a6dac358
--- /dev/null
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsClearLocalScoresButton.cs
@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Select.Options
+{
+    public class BeatmapOptionsClearLocalScoresButton : BeatmapOptionsButton
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            ButtonColour = colour.Purple;
+        }
+
+        public BeatmapOptionsClearLocalScoresButton()
+        {
+            Icon = FontAwesome.fa_eraser;
+            FirstLineText = @"Clear";
+            SecondLineText = @"local scores";
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsDeleteButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsDeleteButton.cs
new file mode 100644
index 0000000000..563cf41a87
--- /dev/null
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsDeleteButton.cs
@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Select.Options
+{
+    public class BeatmapOptionsDeleteButton : BeatmapOptionsButton
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            ButtonColour = colour.Pink;
+        }
+
+        public BeatmapOptionsDeleteButton()
+        {
+            Icon = FontAwesome.fa_trash;
+            FirstLineText = @"Delete";
+            SecondLineText = @"Beatmap";
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsEditButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsEditButton.cs
new file mode 100644
index 0000000000..f88c0df168
--- /dev/null
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsEditButton.cs
@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Select.Options
+{
+    public class BeatmapOptionsEditButton : BeatmapOptionsButton
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            ButtonColour = colour.Yellow;
+        }
+
+        public BeatmapOptionsEditButton()
+        {
+            Icon = FontAwesome.fa_pencil;
+            FirstLineText = @"Edit";
+            SecondLineText = @"Beatmap";
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
new file mode 100644
index 0000000000..2c327b3658
--- /dev/null
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
@@ -0,0 +1,138 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
+
+namespace osu.Game.Screens.Select.Options
+{
+    public class BeatmapOptionsOverlay : FocusedOverlayContainer
+    {
+        private const float transition_duration = 500;
+        private const float x_position = 290;
+
+        private const float height = 100;
+
+        private Box holder;
+        private FillFlowContainer<BeatmapOptionsButton> buttonsContainer;
+
+        public Action OnRemoveFromUnplayed;
+        public Action OnClearLocalScores;
+        public Action OnEdit;
+        public Action OnDelete;
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            if (buttonsContainer.Position.X >= DrawWidth || buttonsContainer.Alpha <= 0)
+                buttonsContainer.MoveToX(-buttonsContainer.DrawWidth);
+
+            buttonsContainer.Alpha = 1;
+
+            holder.ScaleTo(new Vector2(1, 1), transition_duration / 2, EasingTypes.OutQuint);
+
+            buttonsContainer.MoveToX(x_position, transition_duration, EasingTypes.OutQuint);
+            buttonsContainer.TransformSpacingTo(Vector2.Zero, transition_duration, EasingTypes.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+
+            holder.ScaleTo(new Vector2(1, 0), transition_duration / 2, EasingTypes.InSine);
+
+            buttonsContainer.MoveToX(DrawWidth, transition_duration, EasingTypes.InSine);
+            buttonsContainer.TransformSpacingTo(new Vector2(200f, 0f), transition_duration, EasingTypes.InSine);
+
+            Delay(transition_duration);
+            Schedule(() =>
+            {
+                if (State == Visibility.Hidden)
+                    buttonsContainer.Alpha = 0;
+            });
+        }
+
+        public BeatmapOptionsOverlay()
+        {
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+            Anchor = Anchor.BottomLeft;
+            Origin = Anchor.BottomLeft;
+
+            Children = new Drawable[]
+            {
+                holder = new Box
+                {
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.5f,
+                    Scale = new Vector2(1, 0),
+                    Colour = Color4.Black.Opacity(0.5f),
+                },
+                buttonsContainer = new ButtonFlow
+                {
+                    Height = height,
+                    AutoSizeAxes = Axes.X,
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    Children = new BeatmapOptionsButton[]
+                    {
+                        new BeatmapOptionsRemoveFromUnplayedButton
+                        {
+                            Action = () =>
+                            {
+                                Hide();
+                                OnRemoveFromUnplayed?.Invoke();
+                            },
+                        },
+                        new BeatmapOptionsClearLocalScoresButton
+                        {
+                            Action = () =>
+                            {
+                                Hide();
+                                OnClearLocalScores?.Invoke();
+                            },
+                        },
+                        new BeatmapOptionsEditButton
+                        {
+                            Action = () =>
+                            {
+                                Hide();
+                                OnEdit?.Invoke();
+                            },
+                        },
+                        new BeatmapOptionsDeleteButton
+                        {
+                            Action = () =>
+                            {
+                                Hide();
+                                OnDelete?.Invoke();
+                            },
+                        },
+                    },
+                },
+            };
+        }
+
+        private class ButtonFlow : FillFlowContainer<BeatmapOptionsButton>
+        {
+            protected override IComparer<Drawable> DepthComparer => new ReverseCreationOrderDepthComparer();
+            protected override IEnumerable<BeatmapOptionsButton> FlowingChildren => base.FlowingChildren.Reverse();
+
+            public ButtonFlow()
+            {
+                Direction = FillDirection.Horizontal;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsRemoveFromUnplayedButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsRemoveFromUnplayedButton.cs
new file mode 100644
index 0000000000..eeab78ef02
--- /dev/null
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsRemoveFromUnplayedButton.cs
@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Select.Options
+{
+    public class BeatmapOptionsRemoveFromUnplayedButton : BeatmapOptionsButton
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            ButtonColour = colour.Purple;
+        }
+
+        public BeatmapOptionsRemoveFromUnplayedButton()
+        {
+            Icon = FontAwesome.fa_times_circle_o;
+            FirstLineText = @"Remove";
+            SecondLineText = @"from Unplayed";
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 4252de2978..86f9bc30cf 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -27,13 +27,15 @@ using osu.Framework.Input;
 using OpenTK.Input;
 using System.Collections.Generic;
 using osu.Framework.Threading;
+using osu.Game.Overlays.Mods;
 using osu.Game.Overlays;
+using osu.Game.Screens.Select.Options;
 
 namespace osu.Game.Screens.Select
 {
     public class PlaySongSelect : OsuScreen
     {
-        private Bindable<PlayMode> playMode;
+        private Bindable<PlayMode> playMode = new Bindable<PlayMode>();
         private BeatmapDatabase database;
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
 
@@ -44,6 +46,8 @@ namespace osu.Game.Screens.Select
         private static readonly Vector2 wedged_container_size = new Vector2(0.5f, 225);
         private BeatmapInfoWedge beatmapInfoWedge;
 
+        private ModSelectOverlay modSelect;
+
         private static readonly Vector2 background_blur = new Vector2(20);
         private CancellationTokenSource initialAddSetsTask;
 
@@ -52,9 +56,10 @@ namespace osu.Game.Screens.Select
 
         private List<BeatmapGroup> beatmapGroups;
 
+        private BeatmapOptionsOverlay beatmapOptions;
         private Footer footer;
 
-        OsuScreen player;
+        private OsuScreen player;
 
         private FilterControl filter;
         public FilterControl Filter
@@ -75,7 +80,7 @@ namespace osu.Game.Screens.Select
 
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(BeatmapDatabase beatmaps, AudioManager audio, DialogOverlay dialog, Framework.Game game,
-            OsuGame osuGame, OsuColour colours)
+            OsuGame osu, OsuColour colours)
         {
             const float carousel_width = 640;
             const float filter_height = 100;
@@ -111,7 +116,7 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = filter_height,
-                    FilterChanged = filterChanged,
+                    FilterChanged = () => filterChanged(),
                     Exit = Exit,
                 },
                 beatmapInfoWedge = new BeatmapInfoWedge
@@ -125,6 +130,27 @@ namespace osu.Game.Screens.Select
                         Right = 20,
                     },
                 },
+                beatmapOptions = new BeatmapOptionsOverlay
+                {
+                    OnRemoveFromUnplayed = null,
+                    OnClearLocalScores = null,
+                    OnEdit = null,
+                    OnDelete = promptDelete,
+                    Margin = new MarginPadding
+                    {
+                        Bottom = 50,
+                    },
+                },
+                modSelect = new ModSelectOverlay
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Origin = Anchor.BottomCentre,
+                    Anchor = Anchor.BottomCentre,
+                    Margin = new MarginPadding
+                    {
+                        Bottom = 50,
+                    },
+                },
                 footer = new Footer
                 {
                     OnBack = Exit,
@@ -133,24 +159,23 @@ namespace osu.Game.Screens.Select
                         if (player != null || Beatmap == null)
                             return;
 
+                        Beatmap.PreferredPlayMode = playMode.Value;
+
                         (player = new PlayerLoader(new Player
                         {
-                            BeatmapInfo = carousel.SelectedGroup.SelectedPanel.Beatmap,
-                            PreferredPlayMode = playMode.Value
+                            Beatmap = Beatmap, //eagerly set this so it's present before push.
                         })).LoadAsync(Game, l => Push(player));
                     }
                 },
             };
 
-            footer.AddButton(@"mods", colours.Yellow, null);
+            footer.AddButton(@"mods", colours.Yellow, modSelect.ToggleVisibility);
             footer.AddButton(@"random", colours.Green, carousel.SelectRandom);
-            footer.AddButton(@"options", colours.Blue, null);
+            footer.AddButton(@"options", colours.Blue, beatmapOptions.ToggleVisibility);
 
-            if (osuGame != null)
-            {
-                playMode = osuGame.PlayMode;
-                playMode.ValueChanged += playMode_ValueChanged;
-            }
+            if (osu != null)
+                playMode.BindTo(osu.PlayMode);
+            playMode.ValueChanged += playMode_ValueChanged;
 
             if (database == null)
                 database = beatmaps;
@@ -171,7 +196,7 @@ namespace osu.Game.Screens.Select
 
         private ScheduledDelegate filterTask;
 
-        private void filterChanged()
+        private void filterChanged(bool debounce = true, bool eagerSelection = true)
         {
             filterTask?.Cancel();
             filterTask = Scheduler.AddDelayed(() =>
@@ -183,25 +208,42 @@ namespace osu.Game.Screens.Select
                 foreach (var beatmapGroup in carousel)
                 {
                     var set = beatmapGroup.BeatmapSet;
-                    bool match = string.IsNullOrEmpty(search)
+
+                    bool hasCurrentMode = set.Beatmaps.Any(bm => bm.Mode == playMode);
+
+                    bool match = hasCurrentMode;
+
+                    match &= string.IsNullOrEmpty(search)
                         || (set.Metadata.Artist ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1
                         || (set.Metadata.ArtistUnicode ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1
                         || (set.Metadata.Title ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1
                         || (set.Metadata.TitleUnicode ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1;
+
                     if (match)
                     {
-                        beatmapGroup.State = BeatmapGroupState.Collapsed;
                         if (newSelection == null || beatmapGroup.BeatmapSet.OnlineBeatmapSetID == Beatmap.BeatmapSetInfo.OnlineBeatmapSetID)
+                        {
+                            if (newSelection != null)
+                                newSelection.State = BeatmapGroupState.Collapsed;
                             newSelection = beatmapGroup;
+                        }
+                        else
+                            beatmapGroup.State = BeatmapGroupState.Collapsed;
                     }
                     else
                     {
                         beatmapGroup.State = BeatmapGroupState.Hidden;
                     }
                 }
+
                 if (newSelection != null)
-                    carousel.SelectBeatmap(newSelection.BeatmapSet.Beatmaps[0], false);
-            }, 250);
+                {
+                    if (newSelection.BeatmapPanels.Any(b => b.Beatmap.ID == Beatmap.BeatmapInfo.ID))
+                        carousel.SelectBeatmap(Beatmap.BeatmapInfo, false);
+                    else if (eagerSelection)
+                        carousel.SelectBeatmap(newSelection.BeatmapSet.Beatmaps[0], false);
+                }
+            }, debounce ? 250 : 0);
         }
 
         private void onBeatmapSetAdded(BeatmapSetInfo s) => Schedule(() => addBeatmapSet(s, Game, true));
@@ -262,8 +304,6 @@ namespace osu.Game.Screens.Select
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            if (playMode != null)
-                playMode.ValueChanged -= playMode_ValueChanged;
 
             database.BeatmapSetAdded -= onBeatmapSetAdded;
             database.BeatmapSetRemoved -= onBeatmapSetRemoved;
@@ -273,6 +313,7 @@ namespace osu.Game.Screens.Select
 
         private void playMode_ValueChanged(object sender, EventArgs e)
         {
+            filterChanged(false);
         }
 
         private void changeBackground(WorkingBeatmap beatmap)
@@ -296,9 +337,11 @@ namespace osu.Game.Screens.Select
         {
             base.OnBeatmapChanged(beatmap);
 
+            beatmap.Mods.BindTo(modSelect.SelectedMods);
+
             //todo: change background in selectionChanged instead; support per-difficulty backgrounds.
             changeBackground(beatmap);
-            carousel.SelectBeatmap(beatmap?.BeatmapInfo);
+            carousel.SelectBeatmap(beatmap.BeatmapInfo);
         }
 
         /// <summary>
@@ -356,16 +399,15 @@ namespace osu.Game.Screens.Select
             {
                 beatmapGroups.Add(group);
 
+                group.State = BeatmapGroupState.Collapsed;
                 carousel.AddGroup(group);
 
+                filterChanged(false, false);
+
                 if (Beatmap == null || select)
                     carousel.SelectBeatmap(beatmapSet.Beatmaps.First());
                 else
-                {
-                    var panel = group.BeatmapPanels.FirstOrDefault(p => p.Beatmap.Equals(Beatmap.BeatmapInfo));
-                    if (panel != null)
-                        carousel.SelectGroup(group, panel);
-                }
+                    carousel.SelectBeatmap(Beatmap.BeatmapInfo);
             }));
         }
 
@@ -391,22 +433,36 @@ namespace osu.Game.Screens.Select
                 if (token.IsCancellationRequested) return;
                 addBeatmapSet(beatmapSet, game);
             }
-            filterChanged();
+        }
+
+        private void promptDelete()
+        {
+            if (Beatmap != null)
+                dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap));
         }
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {
+            if (args.Repeat) return false;
+
             switch (args.Key)
             {
+                case Key.F1:
+                    modSelect.ToggleVisibility();
+                    return true;
+                case Key.F2:
+                    carousel.SelectRandom();
+                    return true;
+                case Key.F3:
+                    beatmapOptions.ToggleVisibility();
+                    return true;
                 case Key.Enter:
                     footer.StartButton.TriggerClick();
                     return true;
                 case Key.Delete:
                     if (state.Keyboard.ShiftPressed)
                     {
-                        if (Beatmap != null)
-                            dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap));
-
+                        promptDelete();
                         return true;
                     }
                     break;
diff --git a/osu.Game/Screens/Select/WedgeBackground.cs b/osu.Game/Screens/Select/WedgeBackground.cs
index 901fa21c92..af25e9b9ae 100644
--- a/osu.Game/Screens/Select/WedgeBackground.cs
+++ b/osu.Game/Screens/Select/WedgeBackground.cs
@@ -1,10 +1,10 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
 
diff --git a/osu.Game/Screens/Tournament/Components/DrawingsConfigManager.cs b/osu.Game/Screens/Tournament/Components/DrawingsConfigManager.cs
new file mode 100644
index 0000000000..f12d7ab9ce
--- /dev/null
+++ b/osu.Game/Screens/Tournament/Components/DrawingsConfigManager.cs
@@ -0,0 +1,30 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Configuration;
+using osu.Framework.Platform;
+
+namespace osu.Game.Screens.Tournament.Components
+{
+    public class DrawingsConfigManager : ConfigManager<DrawingsConfig>
+    {
+        protected override string Filename => @"drawings.ini";
+
+        protected override void InitialiseDefaults()
+        {
+            Set(DrawingsConfig.Groups, 8, 1, 8);
+            Set(DrawingsConfig.TeamsPerGroup, 8, 1, 8);
+        }
+
+        public DrawingsConfigManager(Storage storage)
+            : base(storage)
+        {
+        }
+    }
+
+    public enum DrawingsConfig
+    {
+        Groups,
+        TeamsPerGroup
+    }
+}
diff --git a/osu.Game/Screens/Tournament/Components/VisualiserContainer.cs b/osu.Game/Screens/Tournament/Components/VisualiserContainer.cs
new file mode 100644
index 0000000000..526768233d
--- /dev/null
+++ b/osu.Game/Screens/Tournament/Components/VisualiserContainer.cs
@@ -0,0 +1,124 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.MathUtils;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace osu.Game.Screens.Tournament.Components
+{
+    internal class VisualiserContainer : Container
+    {
+        /// <summary>
+        /// Number of lines in the visualiser.
+        /// </summary>
+        public int Lines
+        {
+            get { return allLines.Count; }
+            set
+            {
+                while (value > allLines.Count)
+                    addLine();
+
+                while (value < allLines.Count)
+                    removeLine();
+            }
+        }
+
+        private List<VisualiserLine> allLines = new List<VisualiserLine>();
+
+        private float offset;
+
+        private void addLine()
+        {
+            VisualiserLine newLine = new VisualiserLine
+            {
+                RelativeSizeAxes = Axes.Both,
+
+                Offset = offset,
+                CycleTime = RNG.Next(10000, 12000),
+            };
+
+            allLines.Add(newLine);
+            Add(newLine);
+
+            offset += RNG.Next(100, 5000);
+        }
+
+        private void removeLine()
+        {
+            if (allLines.Count == 0)
+                return;
+
+            Remove(allLines.First());
+            allLines.Remove(allLines.First());
+        }
+
+        private class VisualiserLine : Container
+        {
+            /// <summary>
+            /// Time offset.
+            /// </summary>
+            public float Offset;
+
+            public double CycleTime;
+
+            private float leftPos => -(float)((Time.Current + Offset) / CycleTime) + expiredCount;
+
+            private Texture texture;
+
+            private int expiredCount;
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                texture = textures.Get("Drawings/visualiser-line");
+            }
+
+            protected override void UpdateAfterChildren()
+            {
+                base.UpdateAfterChildren();
+
+                while (Children.Count() < 3)
+                    addLine();
+
+                float pos = leftPos;
+
+                foreach (var c in Children)
+                {
+                    if (c.Position.X < -1)
+                    {
+                        c.ClearTransforms();
+                        c.Expire();
+                        expiredCount++;
+                    }
+                    else
+                        c.MoveToX(pos, 100);
+
+                    pos += 1;
+                }
+            }
+
+            private void addLine()
+            {
+                Add(new Sprite
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+
+                    RelativePositionAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.Both,
+
+                    Texture = texture,
+
+                    X = leftPos + 1
+                });
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Tournament/Drawings.cs b/osu.Game/Screens/Tournament/Drawings.cs
new file mode 100644
index 0000000000..61f75021dc
--- /dev/null
+++ b/osu.Game/Screens/Tournament/Drawings.cs
@@ -0,0 +1,336 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Logging;
+using osu.Framework.Platform;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Backgrounds;
+using osu.Game.Screens.Tournament.Components;
+using osu.Game.Screens.Tournament.Teams;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Screens.Tournament
+{
+    public class Drawings : OsuScreen
+    {
+        private const string results_filename = "drawings_results.txt";
+
+        internal override bool ShowOverlays => false;
+
+        protected override BackgroundScreen CreateBackground() => new BackgroundScreenDefault();
+
+        private ScrollingTeamContainer teamsContainer;
+        private GroupContainer groupsContainer;
+        private OsuSpriteText fullTeamNameText;
+
+        private List<Team> allTeams = new List<Team>();
+
+        private DrawingsConfigManager drawingsConfig;
+
+        private Task writeOp;
+
+        private Storage storage;
+
+        public ITeamList TeamList;
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures, Storage storage)
+        {
+            this.storage = storage;
+
+            if (TeamList == null)
+                TeamList = new StorageBackedTeamList(storage);
+
+            if (!TeamList.Teams.Any())
+            {
+                Exit();
+                return;
+            }
+
+            drawingsConfig = new DrawingsConfigManager(storage);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = new Color4(77, 77, 77, 255)
+                },
+                new Sprite
+                {
+                    FillMode = FillMode.Fill,
+                    Texture = textures.Get(@"Backgrounds/Drawings/background.png")
+                },
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+
+                    Children = new Drawable[]
+                    {
+                        // Main container
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Width = 0.85f,
+
+                            Children = new Drawable[]
+                            {
+                                // Visualiser
+                                new VisualiserContainer
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+
+                                    RelativeSizeAxes = Axes.X,
+                                    Size = new Vector2(1, 10),
+
+                                    Colour = new Color4(255, 204, 34, 255),
+
+                                    Lines = 6
+                                },
+                                // Groups
+                                groupsContainer = new GroupContainer(drawingsConfig.Get<int>(DrawingsConfig.Groups), drawingsConfig.Get<int>(DrawingsConfig.TeamsPerGroup))
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+
+                                    RelativeSizeAxes = Axes.Y,
+                                    AutoSizeAxes = Axes.X,
+
+                                    Padding = new MarginPadding
+                                    {
+                                        Top = 35f,
+                                        Bottom = 35f
+                                    }
+                                },
+                                // Scrolling teams
+                                teamsContainer = new ScrollingTeamContainer
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+
+                                    RelativeSizeAxes = Axes.X,
+                                },
+                                // Scrolling team name
+                                fullTeamNameText = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.TopCentre,
+
+                                    Position = new Vector2(0, 45f),
+
+                                    Alpha = 0,
+
+                                    Font = "Exo2.0-Light",
+                                    TextSize = 42f
+                                }
+                            }
+                        },
+                        // Control panel container
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Width = 0.15f,
+
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = new Color4(54, 54, 54, 255)
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+
+                                    Text = "Control Panel",
+                                    TextSize = 22f,
+                                    Font = "Exo2.0-Boldd"
+                                },
+                                new FillFlowContainer
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Width = 0.75f,
+
+                                    Position = new Vector2(0, 35f),
+
+                                    Direction = FillDirection.Vertical,
+                                    Spacing = new Vector2(0, 5f),
+
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuButton
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+
+                                            Text = "Begin random",
+                                            Action = teamsContainer.StartScrolling,
+                                        },
+                                        new OsuButton
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+
+                                            Text = "Stop random",
+                                            Action = teamsContainer.StopScrolling,
+                                        },
+                                        new OsuButton
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+
+                                            Text = "Reload",
+                                            Action = reloadTeams
+                                        }
+                                    }
+                                },
+                                new FillFlowContainer
+                                {
+                                    Anchor = Anchor.BottomCentre,
+                                    Origin = Anchor.BottomCentre,
+
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Width = 0.75f,
+
+                                    Position = new Vector2(0, -5f),
+
+                                    Direction = FillDirection.Vertical,
+                                    Spacing = new Vector2(0, 5f),
+
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuButton
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+
+                                            Text = "Reset",
+                                            Action = () => reset(false)
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            teamsContainer.OnSelected += onTeamSelected;
+            teamsContainer.OnScrollStarted += () => fullTeamNameText.FadeOut(200);
+
+            reset(true);
+        }
+
+        private void onTeamSelected(Team team)
+        {
+            groupsContainer.AddTeam(team);
+
+            fullTeamNameText.Text = team.FullName;
+            fullTeamNameText.FadeIn(200);
+
+            writeResults(groupsContainer.GetStringRepresentation());
+        }
+
+        private void writeResults(string text)
+        {
+            Action writeAction = () =>
+            {
+                try
+                {
+                    // Write to drawings_results
+                    using (Stream stream = storage.GetStream(results_filename, FileAccess.Write, FileMode.Create))
+                    using (StreamWriter sw = new StreamWriter(stream))
+                    {
+                        sw.Write(text);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, "Failed to write results.");
+                }
+            };
+
+            writeOp = writeOp?.ContinueWith(t => { writeAction(); }) ?? Task.Run(writeAction);
+        }
+
+        private void reloadTeams()
+        {
+            teamsContainer.ClearTeams();
+            allTeams.Clear();
+
+            foreach (Team t in TeamList.Teams)
+            {
+                if (groupsContainer.ContainsTeam(t.FullName))
+                    continue;
+
+                allTeams.Add(t);
+                teamsContainer.AddTeam(t);
+            }
+        }
+
+        private void reset(bool loadLastResults = false)
+        {
+            groupsContainer.ClearTeams();
+
+            reloadTeams();
+
+            if (!storage.Exists(results_filename))
+                return;
+
+            if (loadLastResults)
+            {
+                try
+                {
+                    // Read from drawings_results
+                    using (Stream stream = storage.GetStream(results_filename, FileAccess.Read, FileMode.Open))
+                    using (StreamReader sr = new StreamReader(stream))
+                    {
+                        string line;
+                        while ((line = sr.ReadLine()?.Trim()) != null)
+                        {
+                            if (string.IsNullOrEmpty(line))
+                                continue;
+
+                            if (line.ToUpper().StartsWith("GROUP"))
+                                continue;
+
+                            Team teamToAdd = allTeams.FirstOrDefault(t => t.FullName == line);
+
+                            if (teamToAdd == null)
+                                continue;
+
+                            groupsContainer.AddTeam(teamToAdd);
+                            teamsContainer.RemoveTeam(teamToAdd);
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, "Failed to read last drawings results.");
+                }
+
+            }
+            else
+            {
+                writeResults(string.Empty);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Tournament/Group.cs b/osu.Game/Screens/Tournament/Group.cs
new file mode 100644
index 0000000000..b785e809f9
--- /dev/null
+++ b/osu.Game/Screens/Tournament/Group.cs
@@ -0,0 +1,187 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Tournament.Teams;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Screens.Tournament
+{
+    public class Group : Container
+    {
+        public readonly string GroupName;
+
+        public int TeamsCount { get; private set; }
+
+        private FlowContainer<GroupTeam> teams;
+
+        private List<GroupTeam> allTeams = new List<GroupTeam>();
+
+        public Group(string name)
+        {
+            GroupName = name;
+
+            Size = new Vector2(176, 128);
+
+            Masking = true;
+            CornerRadius = 4;
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = new Color4(54, 54, 54, 255)
+                },
+                // Group name
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+
+                    Position = new Vector2(0, 7f),
+
+                    Text = $"GROUP {name.ToUpper()}",
+                    TextSize = 8f,
+                    Font = @"Exo2.0-Bold",
+                    Colour = new Color4(255, 204, 34, 255),
+                },
+                teams = new FillFlowContainer<GroupTeam>
+                {
+                    RelativeSizeAxes = Axes.Both,
+
+                    Spacing = new Vector2(6f, 22),
+
+                    Margin = new MarginPadding
+                    {
+                        Top = 21f,
+                        Bottom = 7f,
+                        Left = 7f,
+                        Right = 7f
+                    }
+                }
+            };
+        }
+
+        public void AddTeam(Team team)
+        {
+            GroupTeam gt = new GroupTeam(team);
+
+            if (TeamsCount < 8)
+            {
+                teams.Add(gt);
+                allTeams.Add(gt);
+
+                TeamsCount++;
+            }
+        }
+
+        public bool ContainsTeam(string fullName)
+        {
+            return allTeams.Any(t => t.Team.FullName == fullName);
+        }
+
+        public bool RemoveTeam(Team team)
+        {
+            allTeams.RemoveAll(gt => gt.Team == team);
+
+            if (teams.RemoveAll(gt => gt.Team == team) > 0)
+            {
+                TeamsCount--;
+                return true;
+            }
+
+            return false;
+        }
+
+        public void ClearTeams()
+        {
+            allTeams.Clear();
+            teams.Clear();
+
+            TeamsCount = 0;
+        }
+
+        public string GetStringRepresentation()
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach (GroupTeam gt in allTeams)
+                sb.AppendLine(gt.Team.FullName);
+            return sb.ToString();
+        }
+
+        private class GroupTeam : Container
+        {
+            public Team Team;
+
+            private FillFlowContainer innerContainer;
+            private Sprite flagSprite;
+
+            public GroupTeam(Team team)
+            {
+                Team = team;
+
+                Width = 36;
+                AutoSizeAxes = Axes.Y;
+
+                Children = new Drawable[]
+                {
+                    innerContainer = new FillFlowContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 5f),
+
+                        Children = new Drawable[]
+                        {
+                            flagSprite = new Sprite
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+
+                                FillMode = FillMode.Fit
+                            },
+                            new OsuSpriteText
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+
+                                Text = team.Acronym.ToUpper(),
+                                TextSize = 10f,
+                                Font = @"Exo2.0-Bold"
+                            }
+                        }
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                innerContainer.ScaleTo(1.5f);
+                innerContainer.ScaleTo(1f, 200);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                flagSprite.Texture = textures.Get($@"Flags/{Team.FlagName}");
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Tournament/GroupContainer.cs b/osu.Game/Screens/Tournament/GroupContainer.cs
new file mode 100644
index 0000000000..ffc1ca8247
--- /dev/null
+++ b/osu.Game/Screens/Tournament/GroupContainer.cs
@@ -0,0 +1,105 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Screens.Tournament.Teams;
+using OpenTK;
+
+namespace osu.Game.Screens.Tournament
+{
+    public class GroupContainer : Container
+    {
+        private List<Group> groups = new List<Group>();
+
+        private int maxTeams;
+        private int currentGroup;
+
+        public GroupContainer(int numGroups, int teamsPerGroup)
+        {
+            FlowContainer<Group> bottomGroups;
+            FlowContainer<Group> topGroups;
+
+            maxTeams = teamsPerGroup;
+
+            char nextGroupName = 'A';
+
+            Children = new[]
+            {
+                topGroups = new FillFlowContainer<Group>
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+
+                    AutoSizeAxes = Axes.Both,
+
+                    Spacing = new Vector2(7f, 0)
+                },
+                bottomGroups = new FillFlowContainer<Group>
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+
+                    AutoSizeAxes = Axes.Both,
+
+                    Spacing = new Vector2(7f, 0)
+                }
+            };
+
+            for (int i = 0; i < numGroups; i++)
+            {
+                Group g = new Group(nextGroupName.ToString());
+
+                groups.Add(g);
+                nextGroupName++;
+
+                if (i < (int)Math.Ceiling(numGroups / 2f))
+                    topGroups.Add(g);
+                else
+                    bottomGroups.Add(g);
+            }
+        }
+
+        public void AddTeam(Team team)
+        {
+            if (groups[currentGroup].TeamsCount == maxTeams)
+                return;
+
+            groups[currentGroup].AddTeam(team);
+
+            currentGroup = (currentGroup + 1) % groups.Count;
+        }
+
+        public bool ContainsTeam(string fullName)
+        {
+            return groups.Any(g => g.ContainsTeam(fullName));
+        }
+
+        public void ClearTeams()
+        {
+            foreach (Group g in groups)
+                g.ClearTeams();
+
+            currentGroup = 0;
+        }
+
+        public string GetStringRepresentation()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            foreach (Group g in groups)
+            {
+                if (g != groups.First())
+                    sb.AppendLine();
+                sb.AppendLine($"Group {g.GroupName}");
+                sb.Append(g.GetStringRepresentation());
+            }
+
+            return sb.ToString();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
new file mode 100644
index 0000000000..899c329be4
--- /dev/null
+++ b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
@@ -0,0 +1,386 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Graphics.Transforms;
+using osu.Framework.Threading;
+using osu.Game.Screens.Tournament.Teams;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Screens.Tournament
+{
+    public class ScrollingTeamContainer : Container
+    {
+        public event Action OnScrollStarted;
+        public event Action<Team> OnSelected;
+
+        private readonly List<Team> availableTeams = new List<Team>();
+
+        private Container tracker;
+
+        private float speed;
+        private int expiredCount;
+
+        private float offset;
+        private float timeOffset;
+        private float leftPos => offset + timeOffset + expiredCount * ScrollingTeam.WIDTH;
+
+        private double lastTime;
+
+        private ScheduledDelegate delayedStateChangeDelegate;
+
+        public ScrollingTeamContainer()
+        {
+            AutoSizeAxes = Axes.Y;
+
+            Children = new Drawable[]
+            {
+                tracker = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+
+                    AutoSizeAxes = Axes.Both,
+
+                    Masking = true,
+                    CornerRadius = 10f,
+                    Alpha = 0,
+
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.BottomCentre,
+                            Size = new Vector2(2, 55),
+
+                            ColourInfo = ColourInfo.GradientVertical(Color4.Transparent, Color4.White)
+                        },
+                        new Box
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.TopCentre,
+                            Size = new Vector2(2, 55),
+
+                            ColourInfo = ColourInfo.GradientVertical(Color4.White, Color4.Transparent)
+                        }
+                    }
+                }
+            };
+        }
+
+        private ScrollState _scrollState;
+        private ScrollState scrollState
+        {
+            get { return _scrollState; }
+            set
+            {
+                if (_scrollState == value)
+                    return;
+
+                _scrollState = value;
+
+                delayedStateChangeDelegate?.Cancel();
+
+                switch (value)
+                {
+                    case ScrollState.Scrolling:
+                        resetSelected();
+
+                        OnScrollStarted?.Invoke();
+
+                        speedTo(1000f, 200);
+                        tracker.FadeOut(100);
+                        break;
+                    case ScrollState.Stopping:
+                        speedTo(0f, 2000);
+                        tracker.FadeIn(200);
+
+                        delayedStateChangeDelegate = Delay(2300).Schedule(() => scrollState = ScrollState.Stopped);
+                        break;
+                    case ScrollState.Stopped:
+                        // Find closest to center
+                        if (!Children.Any())
+                            break;
+
+                        Drawable closest = null;
+
+                        foreach (var c in Children)
+                        {
+                            if (!(c is ScrollingTeam))
+                                continue;
+
+                            if (closest == null)
+                            {
+                                closest = c;
+                                continue;
+                            }
+
+                            float o = Math.Abs(c.Position.X + c.DrawWidth / 2f - DrawWidth / 2f);
+                            float lastOffset = Math.Abs(closest.Position.X + closest.DrawWidth / 2f - DrawWidth / 2f);
+
+                            if (o < lastOffset)
+                                closest = c;
+                        }
+
+                        Trace.Assert(closest != null, "closest != null");
+
+                        offset += DrawWidth / 2f - (closest.Position.X + closest.DrawWidth / 2f);
+
+                        ScrollingTeam st = closest as ScrollingTeam;
+
+                        availableTeams.RemoveAll(at => at == st.Team);
+
+                        st.Selected = true;
+                        OnSelected?.Invoke(st.Team);
+
+                        delayedStateChangeDelegate = Delay(10000).Schedule(() => scrollState = ScrollState.Idle);
+                        break;
+                    case ScrollState.Idle:
+                        resetSelected();
+
+                        OnScrollStarted?.Invoke();
+
+                        speedTo(40f, 200);
+                        tracker.FadeOut(100);
+                        break;
+                }
+            }
+        }
+
+        public void AddTeam(Team team)
+        {
+            if (availableTeams.Contains(team))
+                return;
+
+            availableTeams.Add(team);
+
+            RemoveAll(c => c is ScrollingTeam);
+            scrollState = ScrollState.Idle;
+        }
+
+        public void AddTeams(IEnumerable<Team> teams)
+        {
+            if (teams == null)
+                return;
+
+            foreach (Team t in teams)
+                AddTeam(t);
+        }
+
+        public void ClearTeams()
+        {
+            availableTeams.Clear();
+            RemoveAll(c => c is ScrollingTeam);
+            scrollState = ScrollState.Idle;
+        }
+
+        public void RemoveTeam(Team team)
+        {
+            availableTeams.Remove(team);
+
+            foreach (var c in Children)
+            {
+                ScrollingTeam st = c as ScrollingTeam;
+
+                if (st == null)
+                    continue;
+
+                if (st.Team == team)
+                {
+                    st.FadeOut(200);
+                    st.Expire();
+                }
+            }
+        }
+
+        public void StartScrolling()
+        {
+            if (availableTeams.Count == 0)
+                return;
+
+            scrollState = ScrollState.Scrolling;
+        }
+
+        public void StopScrolling()
+        {
+            if (availableTeams.Count == 0)
+                return;
+
+            switch (scrollState)
+            {
+                case ScrollState.Stopped:
+                case ScrollState.Idle:
+                    return;
+            }
+
+            scrollState = ScrollState.Stopping;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            scrollState = ScrollState.Idle;
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            timeOffset -= (float)(Time.Current - lastTime) / 1000 * speed;
+            lastTime = Time.Current;
+
+            if (availableTeams.Count > 0)
+            {
+                // Fill more than required to account for transformation + scrolling speed
+                while (Children.Count(c => c is ScrollingTeam) < DrawWidth * 2 / ScrollingTeam.WIDTH)
+                    addFlags();
+            }
+
+            float pos = leftPos;
+
+            foreach (var c in Children)
+            {
+                if (!(c is ScrollingTeam))
+                    continue;
+
+                if (c.Position.X + c.DrawWidth < 0)
+                {
+                    c.ClearTransforms();
+                    c.Expire();
+                    expiredCount++;
+                }
+                else
+                {
+                    c.MoveToX(pos, 100);
+                    c.FadeTo(1.0f - Math.Abs(pos - DrawWidth / 2f) / (DrawWidth / 2.5f), 100);
+                }
+
+                pos += ScrollingTeam.WIDTH;
+            }
+        }
+
+        private void addFlags()
+        {
+            foreach (Team t in availableTeams)
+            {
+                Add(new ScrollingTeam(t)
+                {
+                    X = leftPos + DrawWidth
+                });
+            }
+        }
+
+        private void resetSelected()
+        {
+            foreach (var c in Children)
+            {
+                ScrollingTeam st = c as ScrollingTeam;
+                if (st == null)
+                    continue;
+
+                if (st.Selected)
+                {
+                    st.Selected = false;
+                    RemoveTeam(st.Team);
+                }
+            }
+        }
+
+        private void speedTo(float value, double duration = 0, EasingTypes easing = EasingTypes.None)
+        {
+            DelayReset();
+
+            UpdateTransformsOfType(typeof(TransformScrollSpeed));
+            TransformFloatTo(speed, value, duration, easing, new TransformScrollSpeed());
+        }
+
+        private enum ScrollState
+        {
+            None,
+            Idle,
+            Stopping,
+            Stopped,
+            Scrolling
+        }
+
+        public class TransformScrollSpeed : TransformFloat
+        {
+            public override void Apply(Drawable d)
+            {
+                base.Apply(d);
+                ((ScrollingTeamContainer)d).speed = CurrentValue;
+            }
+        }
+
+        public class ScrollingTeam : Container
+        {
+            public const float WIDTH = 58;
+            public const float HEIGHT = 41;
+
+            public Team Team;
+
+            private Sprite flagSprite;
+            private Box outline;
+
+            private bool selected;
+            public bool Selected
+            {
+                get { return selected; }
+                set
+                {
+                    selected = value;
+
+                    if (selected)
+                        outline.FadeIn(100);
+                    else
+                        outline.FadeOut(100);
+                }
+            }
+
+            public ScrollingTeam(Team team)
+            {
+                Team = team;
+
+                Anchor = Anchor.CentreLeft;
+                Origin = Anchor.CentreLeft;
+
+                Size = new Vector2(WIDTH, HEIGHT);
+                Masking = true;
+                CornerRadius = 8f;
+
+                Alpha = 0;
+
+                Children = new Drawable[]
+                {
+                    outline = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0
+                    },
+                    flagSprite = new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+
+                        Size = new Vector2(WIDTH, HEIGHT) - new Vector2(8)
+                    }
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                flagSprite.Texture = textures.Get($@"Flags/{Team.FlagName}");
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Tournament/Teams/ITeamList.cs b/osu.Game/Screens/Tournament/Teams/ITeamList.cs
new file mode 100644
index 0000000000..a4476b64c6
--- /dev/null
+++ b/osu.Game/Screens/Tournament/Teams/ITeamList.cs
@@ -0,0 +1,12 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+
+namespace osu.Game.Screens.Tournament.Teams
+{
+    public interface ITeamList
+    {
+        IEnumerable<Team> Teams { get; }
+    }
+}
diff --git a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
new file mode 100644
index 0000000000..9cdf527eff
--- /dev/null
+++ b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
@@ -0,0 +1,73 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using osu.Framework.Logging;
+using osu.Framework.Platform;
+
+namespace osu.Game.Screens.Tournament.Teams
+{
+    public class StorageBackedTeamList : ITeamList
+    {
+        private const string teams_filename = "drawings.txt";
+
+        private Storage storage;
+
+        public StorageBackedTeamList(Storage storage)
+        {
+            this.storage = storage;
+        }
+
+        public IEnumerable<Team> Teams
+        {
+            get
+            {
+                var teams = new List<Team>();
+
+                try
+                {
+                    using (Stream stream = storage.GetStream(teams_filename, FileAccess.Read, FileMode.Open))
+                    using (StreamReader sr = new StreamReader(stream))
+                    {
+                        while (sr.Peek() != -1)
+                        {
+                            string line = sr.ReadLine()?.Trim();
+
+                            if (string.IsNullOrEmpty(line))
+                                continue;
+
+                            string[] split = line.Split(':');
+
+                            if (split.Length < 2)
+                            {
+                                Logger.Log($"Invalid team definition: {line}. Expected \"flag_name : team_name : team_acronym\".");
+                                continue;
+                            }
+
+                            string flagName = split[0].Trim();
+                            string teamName = split[1].Trim();
+
+                            string acronym = split.Length >= 3 ? split[2].Trim() : teamName;
+                            acronym = acronym.Substring(0, Math.Min(3, acronym.Length));
+
+                            teams.Add(new Team
+                            {
+                                FlagName = flagName,
+                                FullName = teamName,
+                                Acronym = acronym
+                            });
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, "Failed to read teams.");
+                }
+
+                return teams;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Tournament/Teams/Team.cs b/osu.Game/Screens/Tournament/Teams/Team.cs
new file mode 100644
index 0000000000..226f35ec1d
--- /dev/null
+++ b/osu.Game/Screens/Tournament/Teams/Team.cs
@@ -0,0 +1,23 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Screens.Tournament.Teams
+{
+    public class Team
+    {
+        /// <summary>
+        /// The name of this team.
+        /// </summary>
+        public string FullName;
+
+        /// <summary>
+        /// Short acronym which appears in the group boxes post-selection.
+        /// </summary>
+        public string Acronym;
+
+        /// <summary>
+        /// Two-letter flag acronym (ISO 3166 standard)
+        /// </summary>
+        public string FlagName;
+    }
+}
diff --git a/osu.Game/app.config b/osu.Game/app.config
new file mode 100644
index 0000000000..855da39b10
--- /dev/null
+++ b/osu.Game/app.config
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1c5996b51e..3d4a763cb8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -43,6 +43,10 @@
       <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="SharpCompress, Version=0.15.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpCompress.0.15.1\lib\net45\SharpCompress.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
       <Private>True</Private>
@@ -69,6 +73,8 @@
   <ItemGroup>
     <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
     <Compile Include="Beatmaps\DifficultyCalculator.cs" />
+    <Compile Include="Beatmaps\IBeatmapCoverter.cs" />
+    <Compile Include="Database\ScoreDatabase.cs" />
     <Compile Include="Graphics\Backgrounds\Triangles.cs" />
     <Compile Include="Graphics\Cursor\CursorTrail.cs" />
     <Compile Include="Graphics\Sprites\OsuSpriteText.cs" />
@@ -79,12 +85,22 @@
     <Compile Include="Graphics\UserInterface\OsuSliderBar.cs" />
     <Compile Include="Graphics\UserInterface\OsuTextBox.cs" />
     <Compile Include="Graphics\UserInterface\TwoLayerButton.cs" />
+    <Compile Include="Input\Handlers\ReplayInputHandler.cs" />
+    <Compile Include="IO\Legacy\ILegacySerializable.cs" />
+    <Compile Include="IO\Legacy\SerializationReader.cs" />
+    <Compile Include="IO\Legacy\SerializationWriter.cs" />
+    <Compile Include="IPC\ScoreIPCChannel.cs" />
+    <Compile Include="Modes\LegacyReplay.cs" />
     <Compile Include="Modes\Objects\Drawables\IDrawableHitObjectWithProxiedApproach.cs" />
     <Compile Include="Modes\Objects\HitObjectParser.cs" />
     <Compile Include="Modes\Objects\NullHitObjectParser.cs" />
+    <Compile Include="Modes\Replay.cs" />
     <Compile Include="Modes\Score.cs" />
     <Compile Include="Modes\ScoreProcesssor.cs" />
     <Compile Include="Modes\UI\HealthDisplay.cs" />
+    <Compile Include="Modes\UI\HudOverlay.cs" />
+    <Compile Include="Modes\UI\StandardHealthDisplay.cs" />
+    <Compile Include="Modes\UI\StandardHudOverlay.cs" />
     <Compile Include="Online\API\IOnlineComponent.cs" />
     <Compile Include="Online\API\Requests\GetUserRequest.cs" />
     <Compile Include="Overlays\DragBar.cs" />
@@ -120,7 +136,9 @@
     <Compile Include="Graphics\UserInterface\OsuDropDownHeader.cs" />
     <Compile Include="Graphics\UserInterface\OsuDropDownMenu.cs" />
     <Compile Include="Graphics\UserInterface\OsuDropDownMenuItem.cs" />
+    <Compile Include="Overlays\Options\OptionsFooter.cs" />
     <Compile Include="Overlays\Options\Sections\DebugSection.cs" />
+    <Compile Include="Overlays\Options\Sections\Debug\GeneralOptions.cs" />
     <Compile Include="Overlays\Options\Sections\Debug\GCOptions.cs" />
     <Compile Include="Overlays\Toolbar\ToolbarHomeButton.cs" />
     <Compile Include="Overlays\Toolbar\ToolbarMusicButton.cs" />
@@ -153,10 +171,10 @@
     <Compile Include="Screens\Play\PlayerInputManager.cs" />
     <Compile Include="Screens\Play\PlayerLoader.cs" />
     <Compile Include="Screens\Play\SkipButton.cs" />
+    <Compile Include="Modes\UI\StandardComboCounter.cs" />
     <Compile Include="Screens\Select\CarouselContainer.cs" />
     <Compile Include="Screens\Select\MatchSongSelect.cs" />
     <Compile Include="Screens\OsuGameScreen.cs" />
-    <Compile Include="Screens\Play\ModSelect.cs" />
     <Compile Include="Beatmaps\Drawables\BeatmapGroup.cs" />
     <Compile Include="Beatmaps\Drawables\BeatmapPanel.cs" />
     <Compile Include="Screens\Play\Player.cs" />
@@ -168,7 +186,6 @@
     <Compile Include="Screens\Select\PlaySongSelect.cs" />
     <Compile Include="Modes\UI\HitRenderer.cs" />
     <Compile Include="Modes\UI\Playfield.cs" />
-    <Compile Include="Modes\UI\ScoreOverlay.cs" />
     <Compile Include="Screens\Select\EditSongSelect.cs" />
     <Compile Include="Modes\UI\ComboCounter.cs" />
     <Compile Include="Modes\UI\ComboResultCounter.cs" />
@@ -187,13 +204,12 @@
     <Compile Include="Graphics\UserInterface\PercentageCounter.cs" />
     <Compile Include="Graphics\UserInterface\ScoreCounter.cs" />
     <Compile Include="Graphics\UserInterface\StarCounter.cs" />
-    <Compile Include="IPC\BeatmapImporter.cs" />
+    <Compile Include="IPC\BeatmapIPCChannel.cs" />
     <Compile Include="Online\API\APIAccess.cs" />
     <Compile Include="Online\API\APIRequest.cs" />
     <Compile Include="Online\API\OAuth.cs" />
     <Compile Include="Online\API\OAuthToken.cs" />
     <Compile Include="Online\API\Requests\GetMessagesRequest.cs" />
-    <Compile Include="Online\API\SecurePassword.cs" />
     <Compile Include="Online\API\Requests\ListChannels.cs" />
     <Compile Include="Online\Chat\Channel.cs" />
     <Compile Include="Online\Chat\Drawables\DrawableChannel.cs" />
@@ -211,6 +227,15 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Screens\Select\BeatmapInfoWedge.cs" />
     <Compile Include="Screens\Select\WedgeBackground.cs" />
+    <Compile Include="Screens\Tournament\Components\DrawingsConfigManager.cs" />
+    <Compile Include="Screens\Tournament\Components\VisualiserContainer.cs" />
+    <Compile Include="Screens\Tournament\Drawings.cs" />
+    <Compile Include="Screens\Tournament\Group.cs" />
+    <Compile Include="Screens\Tournament\GroupContainer.cs" />
+    <Compile Include="Screens\Tournament\Teams\ITeamList.cs" />
+    <Compile Include="Screens\Tournament\ScrollingTeamContainer.cs" />
+    <Compile Include="Screens\Tournament\Teams\Team.cs" />
+    <Compile Include="Screens\Tournament\Teams\StorageBackedTeamList.cs" />
     <Compile Include="Users\User.cs" />
     <Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
     <Compile Include="Database\BeatmapDatabase.cs" />
@@ -274,12 +299,19 @@
     <Compile Include="Screens\Select\SearchTextBox.cs" />
     <Compile Include="Screens\Select\FooterButton.cs" />
     <Compile Include="Screens\Select\Footer.cs" />
-    <Compile Include="Overlays\Pause\PauseOverlay.cs" />
-    <Compile Include="Overlays\Pause\PauseProgressBar.cs" />
-    <Compile Include="Overlays\Pause\PauseProgressGraph.cs" />
-    <Compile Include="Overlays\Pause\ResumeButton.cs" />
-    <Compile Include="Overlays\Pause\RetryButton.cs" />
-    <Compile Include="Overlays\Pause\QuitButton.cs" />
+    <Compile Include="Screens\Play\PauseOverlay.cs" />
+    <Compile Include="Screens\Play\Pause\PauseProgressBar.cs" />
+    <Compile Include="Screens\Play\Pause\PauseProgressGraph.cs" />
+    <Compile Include="Screens\Play\Pause\ResumeButton.cs" />
+    <Compile Include="Screens\Play\Pause\RetryButton.cs" />
+    <Compile Include="Screens\Play\Pause\QuitButton.cs" />
+    <Compile Include="Overlays\Mods\ModSelectOverlay.cs" />
+    <Compile Include="Modes\Mod.cs" />
+    <Compile Include="Overlays\Mods\ModButton.cs" />
+    <Compile Include="Modes\UI\ModIcon.cs" />
+    <Compile Include="Overlays\Mods\ModSection.cs" />
+    <Compile Include="Overlays\Mods\DifficultyReductionSection.cs" />
+    <Compile Include="Overlays\Mods\DifficultyIncreaseSection.cs" />
     <Compile Include="Overlays\Dialog\PopupDialog.cs" />
     <Compile Include="Graphics\UserInterface\DialogButton.cs" />
     <Compile Include="Overlays\Dialog\PopupDialogButton.cs" />
@@ -287,6 +319,14 @@
     <Compile Include="Overlays\Dialog\PopupDialogCancelButton.cs" />
     <Compile Include="Screens\Select\BeatmapDeleteDialog.cs" />
     <Compile Include="Overlays\DialogOverlay.cs" />
+    <Compile Include="Overlays\Mods\AssistedSection.cs" />
+    <Compile Include="Overlays\WaveOverlayContainer.cs" />
+    <Compile Include="Screens\Select\Options\BeatmapOptionsButton.cs" />
+    <Compile Include="Screens\Select\Options\BeatmapOptionsClearLocalScoresButton.cs" />
+    <Compile Include="Screens\Select\Options\BeatmapOptionsDeleteButton.cs" />
+    <Compile Include="Screens\Select\Options\BeatmapOptionsEditButton.cs" />
+    <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
+    <Compile Include="Screens\Select\Options\BeatmapOptionsRemoveFromUnplayedButton.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">
@@ -302,14 +342,13 @@
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
   <ItemGroup />
-  <ItemGroup>
-    <Folder Include="Overlays\Dialog\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/osu.Game/packages.config b/osu.Game/packages.config
index 15d28ca24f..b2168b864e 100644
--- a/osu.Game/packages.config
+++ b/osu.Game/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
@@ -7,6 +8,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
   <package id="DotNetZip" version="1.10.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
+  <package id="SharpCompress" version="0.15.1" targetFramework="net45" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLiteNetExtensions" version="1.3.0" targetFramework="net45" />
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index d3054a4561..893015dbb1 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -1,30 +1,144 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CanBeReplacedWithTryCastAndCheckForNull/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassWithVirtualMembersNeverInherited_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvertIf/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinDeclarationAndInitializer/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeProtected_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoreSpecificForeachVariableTypeAvailable/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ParameterHidesMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexRemoved">True</s:Boolean>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimPrefix/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimStringPrefix/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELongCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EWhere/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingleOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberInSuper_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
+	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberCallInConstructor/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
@@ -49,7 +163,7 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/MakeFieldPrivate/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/UseAutoProperty/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>