From a112b354f099655d128d8f0fe8d6d81c6ea389a7 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 4 Mar 2017 03:37:34 -0400
Subject: [PATCH 01/94] Basic implementation of score UI

---
 .../Tests/TestCaseLeaderboard.cs              |  29 ++
 .../osu.Desktop.VisualTests.csproj            |   1 +
 osu.Game/Overlays/ChatOverlay.cs              |   2 +
 .../Select/Leaderboards/Leaderboard.cs        |  71 +++++
 .../Leaderboards/LeaderboardScoreDisplay.cs   | 271 ++++++++++++++++++
 osu.Game/osu.Game.csproj                      |   5 +
 6 files changed, 379 insertions(+)
 create mode 100644 osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
 create mode 100644 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
 create mode 100644 osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
new file mode 100644
index 0000000000..f699f694eb
--- /dev/null
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -0,0 +1,29 @@
+// 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.Containers;
+using osu.Framework.Screens.Testing;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Select.Leaderboards;
+using OpenTK;
+
+namespace osu.Desktop.VisualTests
+{
+    public class TestCaseLeaderboard : TestCase
+    {
+        public override string Name => @"Leaderboard";
+        public override string Description => @"From song select";
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(new Leaderboard
+            {
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                Size = new Vector2(550f, 450f),
+            });
+        }
+    }
+}
diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index 569a97e496..332630f641 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -198,6 +198,7 @@
     <Compile Include="Tests\TestCaseModSelectOverlay.cs" />
     <Compile Include="Tests\TestCaseDialogOverlay.cs" />
     <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />
+    <Compile Include="Tests\TestCaseLeaderboard.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index ab5a255897..f86c0a5525 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -97,6 +97,8 @@ namespace osu.Game.Overlays
             if (!string.IsNullOrEmpty(postText))
             {
                 //todo: actually send to server
+
+
                 careChannels.FirstOrDefault()?.AddNewMessages(new[]
                             {
                                 new Message
diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
new file mode 100644
index 0000000000..14f5c49a37
--- /dev/null
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -0,0 +1,71 @@
+// 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 System.Collections.Generic;
+using osu.Game.Modes;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Allocation;
+using osu.Framework.MathUtils;
+using System;
+
+namespace osu.Game.Screens.Select.Leaderboards
+{
+    public class Leaderboard : Container
+    {
+        private FillFlowContainer scrollFlow;
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            for (int i = 0; i < 10; i++)
+            {
+                scrollFlow.Add(new LeaderboardScoreDisplay(new LeaderboardScore
+                {
+                    Avatar = textures.Get(@"Online/avatar-guest"),
+                    Flag = textures.Get(@"Flags/__"),
+                    Name = @"ultralaserxx",
+                    MaxCombo = RNG.Next(0, 3000),
+                    Accuracy = Math.Round(RNG.NextDouble(0, 100), 2),
+                    Score = RNG.Next(0, 1000000),
+                    Mods = new Mod[] { },
+                }, i + 1));
+            }
+        }
+
+        public Leaderboard()
+        {
+            Children = new Drawable[]
+            {
+                new ScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    ScrollDraggerVisible = false,
+                    Children = new Drawable[]
+                    {
+                        scrollFlow = new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Spacing = new Vector2(0f, 5f),
+                        },
+                    },
+                },
+            };
+        }
+    }
+
+    public class LeaderboardScore
+    {
+        public Texture Avatar;
+        public Texture Flag;
+        public Texture Badge;
+        public string Name;
+        public int MaxCombo;
+        public double Accuracy;
+        public int Score;
+        public IEnumerable<Mod> Mods;
+    }
+}
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
new file mode 100644
index 0000000000..daab8387e1
--- /dev/null
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
@@ -0,0 +1,271 @@
+// 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.Graphics;
+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.Graphics.Sprites;
+
+namespace osu.Game.Screens.Select.Leaderboards
+{
+    public class LeaderboardScoreDisplay : Container
+    {
+        private const float height = 70;
+        private const float corner_radius = 5;
+        private const float edge_margin = 10;
+        private const float background_opacity = 0.25f;
+        private const float score_letter_size = 20f;
+
+        private Box background;
+
+        public readonly LeaderboardScore Score;
+
+        protected override bool OnHover(Framework.Input.InputState state)
+        {
+            background.FadeColour(Color4.Black.Opacity(0.5f), 300, EasingTypes.OutQuint);
+            return base.OnHover(state);
+        }
+
+        protected override void OnHoverLost(Framework.Input.InputState state)
+        {
+            background.FadeColour(Color4.Black.Opacity(background_opacity), 200, EasingTypes.OutQuint);
+            base.OnHoverLost(state);
+        }
+
+        public LeaderboardScoreDisplay(LeaderboardScore score, int index)
+        {
+            Score = score;
+
+            RelativeSizeAxes = Axes.X;
+            Height = height;
+
+            Children = new Drawable[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 40,
+                    Children = new[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Font = @"Exo2.0-MediumItalic",
+                            TextSize = 22,
+                            Text = index.ToString(),
+                        },
+                    },
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Left = 40, },
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            CornerRadius = corner_radius,
+                            Masking = true,
+                            Children = new[]
+                            {
+                                background = new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4.Black.Opacity(background_opacity),
+                                },
+                            },
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding(edge_margin),
+                            Children = new Drawable[]
+                            {
+                                new Container
+                                {
+                                    Size = new Vector2(height - edge_margin * 2, height - edge_margin * 2),
+                                    CornerRadius = corner_radius,
+                                    Masking = true,
+                                    Children = new Drawable[]
+                                    {
+                                        new Sprite
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            FillMode = FillMode.Fill,
+                                            Texture = Score.Avatar,
+                                        },
+                                    },
+                                },
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Y,
+                                    AutoSizeAxes = Axes.X,
+                                    Position = new Vector2(height - edge_margin, 0f),
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Text = Score.Name,
+                                            Font = @"Exo2.0-BoldItalic",
+                                            TextSize = 23,
+                                        },
+                                        new FillFlowContainer
+                                        {
+                                            Origin = Anchor.BottomLeft,
+                                            Anchor = Anchor.BottomLeft,
+                                            AutoSizeAxes = Axes.Both,
+                                            Direction = FillDirection.Right,
+                                            Spacing = new Vector2(10f, 0f),
+                                            Children = new Drawable[]
+                                            {
+                                                new Container
+                                                {
+                                                    Origin = Anchor.BottomLeft,
+                                                    Anchor = Anchor.BottomLeft,
+                                                    Size = new Vector2(87f, 20f),
+                                                    Masking = true,
+                                                    Children = new Drawable[]
+                                                    {
+                                                        new Sprite
+                                                        {
+                                                            RelativeSizeAxes = Axes.Y,
+                                                            Width = 30f,
+                                                            Texture = Score.Flag,
+                                                        },
+                                                        new Sprite
+                                                        {
+                                                            Origin = Anchor.BottomRight,
+                                                            Anchor = Anchor.BottomRight,
+                                                            RelativeSizeAxes = Axes.Y,
+                                                            Width = 50f,
+                                                            Texture = Score.Badge,
+                                                        },
+                                                    },
+                                                },
+                                                new FillFlowContainer
+                                                {
+                                                    AutoSizeAxes = Axes.Both,
+                                                    Direction = FillDirection.Right,
+                                                    Spacing = new Vector2(10f, 0f),
+                                                    Margin = new MarginPadding { Left = 10, },
+                                                    Children = new Drawable[]
+                                                    {
+                                                        new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.MaxCombo.ToString()),
+                                                        new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.Accuracy.ToString()),
+                                                    },
+                                                },
+                                            },
+                                        },
+                                    },
+                                },
+                                new Sprite
+                                {
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
+                                    Size = new Vector2(score_letter_size),
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
+                                    Position = new Vector2(-score_letter_size - 5f, 0f),
+                                    Font = @"Venera",
+                                    Text = Score.Score.ToString(),
+                                    TextSize = 23,
+                                },
+                                new FillFlowContainer
+                                {
+                                    Anchor = Anchor.BottomRight,
+                                    Origin = Anchor.BottomRight,
+                                    AutoSizeAxes = Axes.Both,
+                                    // TODO: Probably remove? Seems like others don't like this kind of thing
+                                    Position = new Vector2(0f, 4f), //properly align the mod icons
+                                    Direction = FillDirection.Left,
+                                    Children = new[]
+                                    {
+                                        new ScoreModIcon(FontAwesome.fa_osu_mod_doubletime, OsuColour.FromHex(@"ffcc22")),
+                                        new ScoreModIcon(FontAwesome.fa_osu_mod_flashlight, OsuColour.FromHex(@"ffcc22")),
+                                        new ScoreModIcon(FontAwesome.fa_osu_mod_hidden, OsuColour.FromHex(@"ffcc22")),
+                                        new ScoreModIcon(FontAwesome.fa_osu_mod_hardrock, OsuColour.FromHex(@"ffcc22")),
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            };
+        }
+
+        class ScoreModIcon : Container
+        {
+            public ScoreModIcon(FontAwesome icon, Color4 colour)
+            {
+                AutoSizeAxes = Axes.Both;
+
+                Children = new[]
+                {
+                    new TextAwesome
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Icon = FontAwesome.fa_osu_mod_bg,
+                        Colour = colour,
+                        Shadow = true,
+                        TextSize = 30,
+                    },
+                    new TextAwesome
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Icon = icon,
+                        Colour = OsuColour.Gray(84),
+                        TextSize = 18,
+                    },
+                };
+            }
+        }
+
+        class ScoreComponentLabel : Container
+        {
+            public ScoreComponentLabel(FontAwesome icon, string value)
+            {
+                Anchor = Anchor.CentreLeft;
+                Origin = Anchor.CentreLeft;
+                Size = new Vector2(60f, 20f);
+                Padding = new MarginPadding { Top = 10f, };
+
+                Children = new Drawable[]
+                {
+                    new TextAwesome
+                    {
+                        Icon = FontAwesome.fa_square,
+                        Colour = OsuColour.FromHex(@"3087ac"),
+                        Rotation = 45,
+                        Shadow = true,
+                    },
+                    new TextAwesome
+                    {
+                        Icon = icon,
+                        Colour = OsuColour.FromHex(@"a4edff"),
+                        Scale = new Vector2(0.8f),
+                    },
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.CentreLeft,
+                        Margin = new MarginPadding { Left = 15, },
+                        Font = @"Exo2.0-Bold",
+                        Text = value,
+                        TextSize = 17,
+                    },
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cf98450307..ad66e335eb 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -310,6 +310,8 @@
     <Compile Include="Screens\Select\Options\BeatmapOptionsEditButton.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsRemoveFromUnplayedButton.cs" />
+    <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
+    <Compile Include="Screens\Select\Leaderboards\LeaderboardScoreDisplay.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">
@@ -331,6 +333,9 @@
   <ItemGroup />
   <ItemGroup />
   <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Screens\Select\Leaderboards\" />
+  </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.

From d6f53c8b77081333479a5eb63e56490b240f0fa2 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 4 Mar 2017 04:05:31 -0400
Subject: [PATCH 02/94] Moved test data to visual test

---
 .../Tests/TestCaseLeaderboard.cs              | 42 ++++++++++++++++++-
 .../Select/Leaderboards/Leaderboard.cs        | 31 +++++++-------
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index f699f694eb..d6e54beb64 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -6,24 +6,62 @@ using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Select.Leaderboards;
 using OpenTK;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Allocation;
+using System;
+using osu.Framework.MathUtils;
+using osu.Game.Modes;
+using System.Collections.Generic;
 
 namespace osu.Desktop.VisualTests
 {
-    public class TestCaseLeaderboard : TestCase
+    class TestCaseLeaderboard : TestCase
     {
         public override string Name => @"Leaderboard";
         public override string Description => @"From song select";
 
+        private Leaderboard leaderboard;
+        private TextureStore ts;
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            ts = textures;
+        }
+
+        private void newScores()
+        {
+            var scores = new List<LeaderboardScore>();
+            for (int i = 0; i < 10; i++)
+            {
+                scores.Add(new LeaderboardScore
+                {
+                    Avatar = ts.Get(@"Online/avatar-guest"),
+                    Flag = ts.Get(@"Flags/__"),
+                    Name = @"ultralaserxx",
+                    MaxCombo = RNG.Next(0, 3000),
+                    Accuracy = Math.Round(RNG.NextDouble(0, 100), 2),
+                    Score = RNG.Next(0, 1000000),
+                    Mods = new Mod[] { },
+                });
+            }
+
+            leaderboard.Scores = scores.ToArray();
+        }
+
         public override void Reset()
         {
             base.Reset();
 
-            Add(new Leaderboard
+            Add(leaderboard = new Leaderboard
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
                 Size = new Vector2(550f, 450f),
             });
+
+            AddButton(@"New Scores", () => newScores());
+            newScores();
         }
     }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 14f5c49a37..bc03bcf7be 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -7,31 +7,28 @@ using osu.Framework.Graphics.Containers;
 using System.Collections.Generic;
 using osu.Game.Modes;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Allocation;
-using osu.Framework.MathUtils;
-using System;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
     public class Leaderboard : Container
     {
-        private FillFlowContainer scrollFlow;
+        private FillFlowContainer<LeaderboardScoreDisplay> scrollFlow;
 
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        private LeaderboardScore[] scores;
+        public LeaderboardScore[] Scores
         {
-            for (int i = 0; i < 10; i++)
+            get { return scores; }
+            set
             {
-                scrollFlow.Add(new LeaderboardScoreDisplay(new LeaderboardScore
+                scores = value;
+
+                var scoreDisplays = new List<LeaderboardScoreDisplay>();
+                for (int i = 0; i < value.Length; i++)
                 {
-                    Avatar = textures.Get(@"Online/avatar-guest"),
-                    Flag = textures.Get(@"Flags/__"),
-                    Name = @"ultralaserxx",
-                    MaxCombo = RNG.Next(0, 3000),
-                    Accuracy = Math.Round(RNG.NextDouble(0, 100), 2),
-                    Score = RNG.Next(0, 1000000),
-                    Mods = new Mod[] { },
-                }, i + 1));
+                    scoreDisplays.Add(new LeaderboardScoreDisplay(value[i], i + 1));
+                }
+
+                scrollFlow.Children = scoreDisplays;
             }
         }
 
@@ -45,7 +42,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                     ScrollDraggerVisible = false,
                     Children = new Drawable[]
                     {
-                        scrollFlow = new FillFlowContainer
+                        scrollFlow = new FillFlowContainer<LeaderboardScoreDisplay>
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,

From d1bad3443466053a6e60ca758933d44efc0d792d Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 4 Mar 2017 05:01:55 -0400
Subject: [PATCH 03/94] Enter animation, remove testing mod icons

---
 .../Tests/TestCaseLeaderboard.cs              |  6 +--
 .../Select/Leaderboards/Leaderboard.cs        |  7 ++--
 .../Leaderboards/LeaderboardScoreDisplay.cs   | 38 ++++++++++++++-----
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index d6e54beb64..f8bae179f2 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -36,12 +36,12 @@ namespace osu.Desktop.VisualTests
             {
                 scores.Add(new LeaderboardScore
                 {
+                    Name = @"ultralaserxx",
                     Avatar = ts.Get(@"Online/avatar-guest"),
                     Flag = ts.Get(@"Flags/__"),
-                    Name = @"ultralaserxx",
-                    MaxCombo = RNG.Next(0, 3000),
-                    Accuracy = Math.Round(RNG.NextDouble(0, 100), 2),
                     Score = RNG.Next(0, 1000000),
+                    Accuracy = Math.Round(RNG.NextDouble(0, 100), 2),
+                    MaxCombo = RNG.Next(0, 3000),
                     Mods = new Mod[] { },
                 });
             }
diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index bc03bcf7be..5f9dec36b0 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             get { return scores; }
             set
             {
+                if (value == scores) return;
                 scores = value;
 
                 var scoreDisplays = new List<LeaderboardScoreDisplay>();
@@ -56,13 +57,13 @@ namespace osu.Game.Screens.Select.Leaderboards
 
     public class LeaderboardScore
     {
+        public string Name;
         public Texture Avatar;
         public Texture Flag;
         public Texture Badge;
-        public string Name;
-        public int MaxCombo;
-        public double Accuracy;
         public int Score;
+        public double Accuracy;
+        public int MaxCombo;
         public IEnumerable<Mod> Mods;
     }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
index daab8387e1..591ab2e049 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Modes;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
@@ -22,7 +23,10 @@ namespace osu.Game.Screens.Select.Leaderboards
         private const float score_letter_size = 20f;
 
         private Box background;
+        private Container content;
+        private FillFlowContainer<ScoreModIcon> modsContainer;
 
+        private readonly int index;
         public readonly LeaderboardScore Score;
 
         protected override bool OnHover(Framework.Input.InputState state)
@@ -37,9 +41,24 @@ namespace osu.Game.Screens.Select.Leaderboards
             base.OnHoverLost(state);
         }
 
-        public LeaderboardScoreDisplay(LeaderboardScore score, int index)
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            FadeTo(0.01f); // TODO: This is hacky, find a better way
+            Delay(index * 50);
+            Schedule(() =>
+            {
+                FadeInFromZero(200);
+                content.MoveToX(DrawSize.X);
+                content.MoveToX(0, 500, EasingTypes.OutQuint);
+            });
+        }
+
+        public LeaderboardScoreDisplay(LeaderboardScore score, int i)
         {
             Score = score;
+            index = i;
 
             RelativeSizeAxes = Axes.X;
             Height = height;
@@ -62,7 +81,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                         },
                     },
                 },
-                new Container
+                content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Left = 40, },
@@ -180,7 +199,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     Text = Score.Score.ToString(),
                                     TextSize = 23,
                                 },
-                                new FillFlowContainer
+                                modsContainer = new FillFlowContainer<ScoreModIcon>
                                 {
                                     Anchor = Anchor.BottomRight,
                                     Origin = Anchor.BottomRight,
@@ -188,19 +207,18 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     // TODO: Probably remove? Seems like others don't like this kind of thing
                                     Position = new Vector2(0f, 4f), //properly align the mod icons
                                     Direction = FillDirection.Left,
-                                    Children = new[]
-                                    {
-                                        new ScoreModIcon(FontAwesome.fa_osu_mod_doubletime, OsuColour.FromHex(@"ffcc22")),
-                                        new ScoreModIcon(FontAwesome.fa_osu_mod_flashlight, OsuColour.FromHex(@"ffcc22")),
-                                        new ScoreModIcon(FontAwesome.fa_osu_mod_hidden, OsuColour.FromHex(@"ffcc22")),
-                                        new ScoreModIcon(FontAwesome.fa_osu_mod_hardrock, OsuColour.FromHex(@"ffcc22")),
-                                    },
                                 },
                             },
                         },
                     },
                 },
             };
+
+            foreach (Mod mod in Score.Mods)
+            {
+                // TODO: Get actual mod colours
+                modsContainer.Add(new ScoreModIcon(mod.Icon, OsuColour.FromHex(@"ffcc22")));
+            }
         }
 
         class ScoreModIcon : Container

From 269c139d2a2beb3dd32e987b3b1b20e6ccde6035 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 4 Mar 2017 22:29:52 -0400
Subject: [PATCH 04/94] Flags(redoing later), glowing text, proper Score and
 User usage

---
 .../Tests/TestCaseLeaderboard.cs              | 33 +++----
 osu.Game/Modes/Score.cs                       |  4 +
 .../Select/Leaderboards/Leaderboard.cs        | 47 +++++++---
 .../Leaderboards/LeaderboardScoreDisplay.cs   | 92 +++++++++++++++----
 osu.Game/Screens/Select/PlaySongSelect.cs     |  1 +
 osu.Game/Users/User.cs                        |  5 +
 6 files changed, 132 insertions(+), 50 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index f8bae179f2..855bf15eba 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -1,17 +1,18 @@
 // 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 System;
+using System.Linq;
+using System.Collections.Generic;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
-using osu.Game.Screens.Select.Leaderboards;
-using OpenTK;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Allocation;
-using System;
 using osu.Framework.MathUtils;
+using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Modes;
-using System.Collections.Generic;
 
 namespace osu.Desktop.VisualTests
 {
@@ -21,28 +22,24 @@ namespace osu.Desktop.VisualTests
         public override string Description => @"From song select";
 
         private Leaderboard leaderboard;
-        private TextureStore ts;
-
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            ts = textures;
-        }
 
         private void newScores()
         {
-            var scores = new List<LeaderboardScore>();
+            var scores = new List<Score>();
             for (int i = 0; i < 10; i++)
             {
-                scores.Add(new LeaderboardScore
+                scores.Add(new Score
                 {
-                    Name = @"ultralaserxx",
-                    Avatar = ts.Get(@"Online/avatar-guest"),
-                    Flag = ts.Get(@"Flags/__"),
-                    Score = RNG.Next(0, 1000000),
                     Accuracy = Math.Round(RNG.NextDouble(0, 100), 2),
                     MaxCombo = RNG.Next(0, 3000),
-                    Mods = new Mod[] { },
+                    TotalScore = RNG.Next(1, 1000000),
+                    Mods = Ruleset.GetRuleset(PlayMode.Osu).GetModsFor(ModType.DifficultyIncrease).ToArray(),
+                    User = new Game.Users.User
+                    {
+                        Id = 2,
+                        Username = @"peppy",
+                        FlagName = @"AU",
+                    },
                 });
             }
 
diff --git a/osu.Game/Modes/Score.cs b/osu.Game/Modes/Score.cs
index 8da09cb974..9107e424db 100644
--- a/osu.Game/Modes/Score.cs
+++ b/osu.Game/Modes/Score.cs
@@ -1,6 +1,8 @@
 // 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.Users;
+
 namespace osu.Game.Modes
 {
     public class Score
@@ -10,5 +12,7 @@ namespace osu.Game.Modes
         public double Combo { get; set; }
         public double MaxCombo { get; set; }
         public double Health { get; set; }
+        public Mod[] Mods { get; set; }
+        public User User { get; set; }
     }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 5f9dec36b0..384d71634a 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -1,21 +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 System.Collections.Generic;
 using OpenTK;
+using OpenTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using System.Collections.Generic;
+using osu.Framework.Graphics.Colour;
+using osu.Game.Graphics;
 using osu.Game.Modes;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Transforms;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
     public class Leaderboard : Container
     {
+        private ScrollContainer scrollContainer;
         private FillFlowContainer<LeaderboardScoreDisplay> scrollFlow;
 
-        private LeaderboardScore[] scores;
-        public LeaderboardScore[] Scores
+        private Score[] scores;
+        public Score[] Scores
         {
             get { return scores; }
             set
@@ -30,6 +37,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                 }
 
                 scrollFlow.Children = scoreDisplays;
+                scrollContainer.ScrollTo(0f, false);
             }
         }
 
@@ -37,7 +45,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         {
             Children = new Drawable[]
             {
-                new ScrollContainer
+                scrollContainer = new ScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollDraggerVisible = false,
@@ -55,15 +63,28 @@ namespace osu.Game.Screens.Select.Leaderboards
         }
     }
 
-    public class LeaderboardScore
+    class LeaderboardFade : Container
     {
-        public string Name;
-        public Texture Avatar;
-        public Texture Flag;
-        public Texture Badge;
-        public int Score;
-        public double Accuracy;
-        public int MaxCombo;
-        public IEnumerable<Mod> Mods;
+        private Box gradient;
+
+        protected override bool OnMouseDown(Framework.Input.InputState state, Framework.Input.MouseDownEventArgs args)
+        {
+            if (state.Keyboard.ShiftPressed)
+                FadeIn();
+            else
+                FadeOut();
+            
+            return base.OnMouseDown(state, args);
+        }
+
+        public void FadeIn()
+        {
+            gradient.FadeColour(Color4.White, 300, EasingTypes.OutQuint);
+        }
+
+        public void FadeOut()
+        {
+            gradient.FadeColour(Color4.White.Opacity(0), 300, EasingTypes.OutQuint);
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
index 591ab2e049..3302009a5c 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
@@ -11,6 +11,8 @@ using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
@@ -22,12 +24,27 @@ namespace osu.Game.Screens.Select.Leaderboards
         private const float background_opacity = 0.25f;
         private const float score_letter_size = 20f;
 
+        private readonly EdgeEffect imageShadow = new EdgeEffect
+        {
+            Type = EdgeEffectType.Shadow,
+            Radius = 1,
+            Colour = Color4.Black.Opacity(0.2f),
+        };
+
         private Box background;
         private Container content;
+        private Sprite avatar, flag;
         private FillFlowContainer<ScoreModIcon> modsContainer;
 
         private readonly int index;
-        public readonly LeaderboardScore Score;
+        public readonly Score Score;
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            avatar.Texture = textures.Get($@"https://a.ppy.sh/{Score.User.Id}") ?? textures.Get(@"Online/avatar-guest");
+            flag.Texture = textures.Get($@"Flags/{Score.User.FlagName}");
+        }
 
         protected override bool OnHover(Framework.Input.InputState state)
         {
@@ -45,17 +62,18 @@ namespace osu.Game.Screens.Select.Leaderboards
         {
             base.LoadComplete();
 
-            FadeTo(0.01f); // TODO: This is hacky, find a better way
+            // TODO: This is hacky, find a better way
+            FadeTo(0.01f);
+            content.MoveToX(DrawSize.X);
             Delay(index * 50);
             Schedule(() =>
             {
                 FadeInFromZero(200);
-                content.MoveToX(DrawSize.X);
                 content.MoveToX(0, 500, EasingTypes.OutQuint);
             });
         }
 
-        public LeaderboardScoreDisplay(LeaderboardScore score, int i)
+        public LeaderboardScoreDisplay(Score score, int i)
         {
             Score = score;
             index = i;
@@ -112,13 +130,12 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     Size = new Vector2(height - edge_margin * 2, height - edge_margin * 2),
                                     CornerRadius = corner_radius,
                                     Masking = true,
+                                    EdgeEffect = imageShadow,
                                     Children = new Drawable[]
                                     {
-                                        new Sprite
+                                        avatar = new Sprite
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            FillMode = FillMode.Fill,
-                                            Texture = Score.Avatar,
                                         },
                                     },
                                 },
@@ -131,7 +148,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     {
                                         new OsuSpriteText
                                         {
-                                            Text = Score.Name,
+                                            Text = Score.User?.Username,
                                             Font = @"Exo2.0-BoldItalic",
                                             TextSize = 23,
                                         },
@@ -152,11 +169,10 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                     Masking = true,
                                                     Children = new Drawable[]
                                                     {
-                                                        new Sprite
+                                                        flag = new Sprite
                                                         {
                                                             RelativeSizeAxes = Axes.Y,
                                                             Width = 30f,
-                                                            Texture = Score.Flag,
                                                         },
                                                         new Sprite
                                                         {
@@ -164,7 +180,6 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                             Anchor = Anchor.BottomRight,
                                                             RelativeSizeAxes = Axes.Y,
                                                             Width = 50f,
-                                                            Texture = Score.Badge,
                                                         },
                                                     },
                                                 },
@@ -190,14 +205,11 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     Origin = Anchor.TopRight,
                                     Size = new Vector2(score_letter_size),
                                 },
-                                new OsuSpriteText
+                                new GlowingSpriteText(string.Format("{0:n0}", Score.TotalScore), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
                                 {
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
                                     Position = new Vector2(-score_letter_size - 5f, 0f),
-                                    Font = @"Venera",
-                                    Text = Score.Score.ToString(),
-                                    TextSize = 23,
                                 },
                                 modsContainer = new FillFlowContainer<ScoreModIcon>
                                 {
@@ -221,6 +233,51 @@ namespace osu.Game.Screens.Select.Leaderboards
             }
         }
 
+        class GlowingSpriteText : Container
+        {
+            public GlowingSpriteText(string text, string font, int textSize, Color4 textColour, Color4 glowColour)
+            {
+                AutoSizeAxes = Axes.Both;
+
+                Children = new Drawable[]
+                {
+                    new BufferedContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        BlurSigma = new Vector2(4),
+                        CacheDrawnFrameBuffer = true,
+                        RelativeSizeAxes = Axes.Both,
+                        BlendingMode = BlendingMode.Additive,
+                        Size = new Vector2(3f),
+                        Children = new[]
+                        {
+                            new OsuSpriteText
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Font = font,
+                                TextSize = textSize,
+                                Text = text,
+                                Colour = glowColour,
+                                Shadow = false,
+                            },
+                        },
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Font = font,
+                        TextSize = textSize,
+                        Text = text,
+                        Colour = textColour,
+                        Shadow = false,
+                    },
+                };
+            }
+        }
+
         class ScoreModIcon : Container
         {
             public ScoreModIcon(FontAwesome icon, Color4 colour)
@@ -274,13 +331,10 @@ namespace osu.Game.Screens.Select.Leaderboards
                         Colour = OsuColour.FromHex(@"a4edff"),
                         Scale = new Vector2(0.8f),
                     },
-                    new OsuSpriteText
+                    new GlowingSpriteText(value, @"Exo2.0-Bold", 17, Color4.White, OsuColour.FromHex(@"83ccfa"))
                     {
                         Origin = Anchor.CentreLeft,
                         Margin = new MarginPadding { Left = 15, },
-                        Font = @"Exo2.0-Bold",
-                        Text = value,
-                        TextSize = 17,
                     },
                 };
             }
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 68783f33db..39cfba7368 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -30,6 +30,7 @@ using osu.Framework.Threading;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays;
 using osu.Game.Screens.Select.Options;
+using osu.Game.Screens.Select.Leaderboards;
 
 namespace osu.Game.Screens.Select
 {
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 540bfdbbf9..8301becc76 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -7,5 +7,10 @@ namespace osu.Game.Users
     {
         public int Id;
         public string Username;
+
+        /// <summary>
+        /// Two-letter flag acronym (ISO 3166 standard)
+        /// </summary>
+        public string FlagName;
     }
 }

From b02e413e56358bf451f3387f9d4ee53d282805d4 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 4 Mar 2017 22:30:48 -0400
Subject: [PATCH 05/94] Removed LeaderboardFade fully

---
 .../Select/Leaderboards/Leaderboard.cs        | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 384d71634a..19d137d0e2 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -62,29 +62,4 @@ namespace osu.Game.Screens.Select.Leaderboards
             };
         }
     }
-
-    class LeaderboardFade : Container
-    {
-        private Box gradient;
-
-        protected override bool OnMouseDown(Framework.Input.InputState state, Framework.Input.MouseDownEventArgs args)
-        {
-            if (state.Keyboard.ShiftPressed)
-                FadeIn();
-            else
-                FadeOut();
-            
-            return base.OnMouseDown(state, args);
-        }
-
-        public void FadeIn()
-        {
-            gradient.FadeColour(Color4.White, 300, EasingTypes.OutQuint);
-        }
-
-        public void FadeOut()
-        {
-            gradient.FadeColour(Color4.White.Opacity(0), 300, EasingTypes.OutQuint);
-        }
-    }
 }

From 5719c6656aa7d01ecf740934604996ffaa3301e3 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 4 Mar 2017 22:38:01 -0400
Subject: [PATCH 06/94] Update to work with latest framework

---
 .../Select/Leaderboards/LeaderboardScoreDisplay.cs        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
index 3302009a5c..c9242a9ba3 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
@@ -157,14 +157,12 @@ namespace osu.Game.Screens.Select.Leaderboards
                                             Origin = Anchor.BottomLeft,
                                             Anchor = Anchor.BottomLeft,
                                             AutoSizeAxes = Axes.Both,
-                                            Direction = FillDirection.Right,
+                                            Direction = FillDirection.Horizontal,
                                             Spacing = new Vector2(10f, 0f),
                                             Children = new Drawable[]
                                             {
                                                 new Container
                                                 {
-                                                    Origin = Anchor.BottomLeft,
-                                                    Anchor = Anchor.BottomLeft,
                                                     Size = new Vector2(87f, 20f),
                                                     Masking = true,
                                                     Children = new Drawable[]
@@ -186,7 +184,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                 new FillFlowContainer
                                                 {
                                                     AutoSizeAxes = Axes.Both,
-                                                    Direction = FillDirection.Right,
+                                                    Direction = FillDirection.Horizontal,
                                                     Spacing = new Vector2(10f, 0f),
                                                     Margin = new MarginPadding { Left = 10, },
                                                     Children = new Drawable[]
@@ -218,7 +216,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     AutoSizeAxes = Axes.Both,
                                     // TODO: Probably remove? Seems like others don't like this kind of thing
                                     Position = new Vector2(0f, 4f), //properly align the mod icons
-                                    Direction = FillDirection.Left,
+                                    Direction = FillDirection.Horizontal,
                                 },
                             },
                         },

From 9912f5f9e168b294ca4f580c3696f90f68d77438 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Mon, 13 Mar 2017 09:33:25 -0300
Subject: [PATCH 07/94] Team -> Region, +IHasDrawableRepresentation,
 +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay ->
 LeaderboardScore

---
 .../Tests/TestCaseDrawings.cs                 | 21 +++---
 .../Tests/TestCaseLeaderboard.cs              |  8 +-
 .../IHasDrawableRepresentation.cs             | 12 +++
 .../Select/Leaderboards/Leaderboard.cs        | 17 ++---
 ...ardScoreDisplay.cs => LeaderboardScore.cs} | 34 ++++-----
 osu.Game/Screens/Tournament/Drawings.cs       | 15 ++--
 osu.Game/Screens/Tournament/Group.cs          |  9 ++-
 osu.Game/Screens/Tournament/GroupContainer.cs |  3 +-
 .../Tournament/ScrollingTeamContainer.cs      | 18 ++---
 .../Screens/Tournament/Teams/ITeamList.cs     |  3 +-
 .../Tournament/Teams/StorageBackedTeamList.cs |  7 +-
 osu.Game/Screens/Tournament/Teams/Team.cs     | 23 ------
 osu.Game/Users/Badge.cs                       | 23 ++++++
 osu.Game/Users/Region.cs                      | 73 +++++++++++++++++++
 osu.Game/Users/User.cs                        |  9 +--
 osu.Game/osu.Game.csproj                      |  6 +-
 16 files changed, 183 insertions(+), 98 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs
 rename osu.Game/Screens/Select/Leaderboards/{LeaderboardScoreDisplay.cs => LeaderboardScore.cs} (88%)
 delete mode 100644 osu.Game/Screens/Tournament/Teams/Team.cs
 create mode 100644 osu.Game/Users/Badge.cs
 create mode 100644 osu.Game/Users/Region.cs

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs b/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs
index 4fe7e805ec..69697fe714 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs
@@ -7,6 +7,7 @@ using osu.Framework.Platform;
 using osu.Framework.Screens.Testing;
 using osu.Game.Screens.Tournament;
 using osu.Game.Screens.Tournament.Teams;
+using osu.Game.Users;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -32,57 +33,57 @@ namespace osu.Desktop.VisualTests.Tests
 
         class TestTeamList : ITeamList
         {
-            public IEnumerable<Team> Teams { get; } = new[]
+            public IEnumerable<Region> Teams { get; } = new[]
             {
-                new Team
+                new Region
                 {
                     FlagName = "GB",
                     FullName = "United Kingdom",
                     Acronym = "UK"
                 },
-                new Team
+                new Region
                 {
                     FlagName = "FR",
                     FullName = "France",
                     Acronym = "FRA"
                 },
-                new Team
+                new Region
                 {
                     FlagName = "CN",
                     FullName = "China",
                     Acronym = "CHN"
                 },
-                new Team
+                new Region
                 {
                     FlagName = "AU",
                     FullName = "Australia",
                     Acronym = "AUS"
                 },
-                new Team
+                new Region
                 {
                     FlagName = "JP",
                     FullName = "Japan",
                     Acronym = "JPN"
                 },
-                new Team
+                new Region
                 {
                     FlagName = "RO",
                     FullName = "Romania",
                     Acronym = "ROM"
                 },
-                new Team
+                new Region
                 {
                     FlagName = "IT",
                     FullName = "Italy",
                     Acronym = "PIZZA"
                 },
-                new Team
+                new Region
                 {
                     FlagName = "VE",
                     FullName = "Venezuela",
                     Acronym = "VNZ"
                 },
-                new Team
+                new Region
                 {
                     FlagName = "US",
                     FullName = "United States of America",
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index 855bf15eba..44b26d46f7 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -13,6 +13,7 @@ using osu.Framework.Allocation;
 using osu.Framework.MathUtils;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Modes;
+using osu.Game.Users;
 
 namespace osu.Desktop.VisualTests
 {
@@ -38,7 +39,12 @@ namespace osu.Desktop.VisualTests
                     {
                         Id = 2,
                         Username = @"peppy",
-                        FlagName = @"AU",
+                        Region = new Region
+                        {
+                            FullName = @"Australia",
+                            Acronym = @"AUS",
+                            FlagName = @"AU",
+                        },
                     },
                 });
             }
diff --git a/osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs b/osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs
new file mode 100644
index 0000000000..0dfddddb3f
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.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.Framework.Graphics;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public interface IHasDrawableRepresentation<T> where T : Drawable
+    {
+        T CreateDrawable();
+    }
+}
diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 19d137d0e2..6acdc17996 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -1,25 +1,18 @@
 // 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 OpenTK;
-using OpenTK.Graphics;
+using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Colour;
-using osu.Game.Graphics;
 using osu.Game.Modes;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Transforms;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
     public class Leaderboard : Container
     {
         private ScrollContainer scrollContainer;
-        private FillFlowContainer<LeaderboardScoreDisplay> scrollFlow;
+        private FillFlowContainer<LeaderboardScore> scrollFlow;
 
         private Score[] scores;
         public Score[] Scores
@@ -30,10 +23,10 @@ namespace osu.Game.Screens.Select.Leaderboards
                 if (value == scores) return;
                 scores = value;
 
-                var scoreDisplays = new List<LeaderboardScoreDisplay>();
+                var scoreDisplays = new List<LeaderboardScore>();
                 for (int i = 0; i < value.Length; i++)
                 {
-                    scoreDisplays.Add(new LeaderboardScoreDisplay(value[i], i + 1));
+                    scoreDisplays.Add(new LeaderboardScore(value[i], i + 1));
                 }
 
                 scrollFlow.Children = scoreDisplays;
@@ -51,7 +44,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                     ScrollDraggerVisible = false,
                     Children = new Drawable[]
                     {
-                        scrollFlow = new FillFlowContainer<LeaderboardScoreDisplay>
+                        scrollFlow = new FillFlowContainer<LeaderboardScore>
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
similarity index 88%
rename from osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
rename to osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index c9242a9ba3..82eae852a4 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScoreDisplay.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -13,15 +13,16 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Allocation;
+using System.Linq;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
-    public class LeaderboardScoreDisplay : Container
+    public class LeaderboardScore : Container
     {
         private const float height = 70;
         private const float corner_radius = 5;
         private const float edge_margin = 10;
-        private const float background_opacity = 0.25f;
+        private const float background_alpha = 0.25f;
         private const float score_letter_size = 20f;
 
         private readonly EdgeEffect imageShadow = new EdgeEffect
@@ -33,7 +34,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private Box background;
         private Container content;
-        private Sprite avatar, flag;
+        private Sprite avatar;
         private FillFlowContainer<ScoreModIcon> modsContainer;
 
         private readonly int index;
@@ -43,18 +44,17 @@ namespace osu.Game.Screens.Select.Leaderboards
         private void load(TextureStore textures)
         {
             avatar.Texture = textures.Get($@"https://a.ppy.sh/{Score.User.Id}") ?? textures.Get(@"Online/avatar-guest");
-            flag.Texture = textures.Get($@"Flags/{Score.User.FlagName}");
         }
 
         protected override bool OnHover(Framework.Input.InputState state)
         {
-            background.FadeColour(Color4.Black.Opacity(0.5f), 300, EasingTypes.OutQuint);
+            background.FadeTo(0.5f, 300, EasingTypes.OutQuint);
             return base.OnHover(state);
         }
 
         protected override void OnHoverLost(Framework.Input.InputState state)
         {
-            background.FadeColour(Color4.Black.Opacity(background_opacity), 200, EasingTypes.OutQuint);
+            background.FadeTo(background_alpha, 200, EasingTypes.OutQuint);
             base.OnHoverLost(state);
         }
 
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             });
         }
 
-        public LeaderboardScoreDisplay(Score score, int i)
+        public LeaderboardScore(Score score, int i)
         {
             Score = score;
             index = i;
@@ -81,6 +81,10 @@ namespace osu.Game.Screens.Select.Leaderboards
             RelativeSizeAxes = Axes.X;
             Height = height;
 
+            var flag = Score.User.Region.CreateDrawable();
+            flag.Width = 30;
+            flag.RelativeSizeAxes = Axes.Y;
+
             Children = new Drawable[]
             {
                 new Container
@@ -115,7 +119,8 @@ namespace osu.Game.Screens.Select.Leaderboards
                                 background = new Box
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4.Black.Opacity(background_opacity),
+                                    Colour = Color4.Black,
+                                    Alpha = background_alpha,
                                 },
                             },
                         },
@@ -167,18 +172,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                     Masking = true,
                                                     Children = new Drawable[]
                                                     {
-                                                        flag = new Sprite
-                                                        {
-                                                            RelativeSizeAxes = Axes.Y,
-                                                            Width = 30f,
-                                                        },
-                                                        new Sprite
-                                                        {
-                                                            Origin = Anchor.BottomRight,
-                                                            Anchor = Anchor.BottomRight,
-                                                            RelativeSizeAxes = Axes.Y,
-                                                            Width = 50f,
-                                                        },
+                                                        flag,
                                                     },
                                                 },
                                                 new FillFlowContainer
diff --git a/osu.Game/Screens/Tournament/Drawings.cs b/osu.Game/Screens/Tournament/Drawings.cs
index f9155bbc2a..b6a304c699 100644
--- a/osu.Game/Screens/Tournament/Drawings.cs
+++ b/osu.Game/Screens/Tournament/Drawings.cs
@@ -21,6 +21,7 @@ using osu.Game.Screens.Tournament.Components;
 using osu.Game.Screens.Tournament.Teams;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Tournament
 {
@@ -36,7 +37,7 @@ namespace osu.Game.Screens.Tournament
         private GroupContainer groupsContainer;
         private OsuSpriteText fullTeamNameText;
 
-        private List<Team> allTeams = new List<Team>();
+        private List<Region> allTeams = new List<Region>();
 
         private DrawingsConfigManager drawingsConfig;
 
@@ -238,7 +239,7 @@ namespace osu.Game.Screens.Tournament
             reset(true);
         }
 
-        private void onTeamSelected(Team team)
+        private void onTeamSelected(Region team)
         {
             groupsContainer.AddTeam(team);
 
@@ -278,13 +279,13 @@ namespace osu.Game.Screens.Tournament
             teamsContainer.ClearTeams();
             allTeams.Clear();
 
-            foreach (Team t in TeamList.Teams)
+            foreach (Region r in TeamList.Teams)
             {
-                if (groupsContainer.ContainsTeam(t.FullName))
+                if (groupsContainer.ContainsTeam(r.FullName))
                     continue;
 
-                allTeams.Add(t);
-                teamsContainer.AddTeam(t);
+                allTeams.Add(r);
+                teamsContainer.AddTeam(r);
             }
         }
 
@@ -314,7 +315,7 @@ namespace osu.Game.Screens.Tournament
                             if (line.ToUpper().StartsWith("GROUP"))
                                 continue;
 
-                            Team teamToAdd = allTeams.FirstOrDefault(t => t.FullName == line);
+                            Region teamToAdd = allTeams.FirstOrDefault(r => r.FullName == line);
 
                             if (teamToAdd == null)
                                 continue;
diff --git a/osu.Game/Screens/Tournament/Group.cs b/osu.Game/Screens/Tournament/Group.cs
index 44af4c8182..b2b1648684 100644
--- a/osu.Game/Screens/Tournament/Group.cs
+++ b/osu.Game/Screens/Tournament/Group.cs
@@ -14,6 +14,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Tournament.Teams;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Tournament
 {
@@ -73,7 +74,7 @@ namespace osu.Game.Screens.Tournament
             };
         }
 
-        public void AddTeam(Team team)
+        public void AddTeam(Region team)
         {
             GroupTeam gt = new GroupTeam(team);
 
@@ -91,7 +92,7 @@ namespace osu.Game.Screens.Tournament
             return allTeams.Any(t => t.Team.FullName == fullName);
         }
 
-        public bool RemoveTeam(Team team)
+        public bool RemoveTeam(Region team)
         {
             allTeams.RemoveAll(gt => gt.Team == team);
 
@@ -122,12 +123,12 @@ namespace osu.Game.Screens.Tournament
 
         class GroupTeam : Container
         {
-            public Team Team;
+            public Region Team;
 
             private FillFlowContainer innerContainer;
             private Sprite flagSprite;
 
-            public GroupTeam(Team team)
+            public GroupTeam(Region team)
             {
                 Team = team;
 
diff --git a/osu.Game/Screens/Tournament/GroupContainer.cs b/osu.Game/Screens/Tournament/GroupContainer.cs
index 936881b47c..fd27fcf520 100644
--- a/osu.Game/Screens/Tournament/GroupContainer.cs
+++ b/osu.Game/Screens/Tournament/GroupContainer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Tournament.Teams;
 using OpenTK;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Tournament
 {
@@ -61,7 +62,7 @@ namespace osu.Game.Screens.Tournament
             }
         }
 
-        public void AddTeam(Team team)
+        public void AddTeam(Region team)
         {
             if (groups[currentGroup].TeamsCount == maxTeams)
                 return;
diff --git a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
index 35369247ff..feaf8f53b6 100644
--- a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
+++ b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
@@ -12,18 +12,18 @@ 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;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Tournament
 {
     public class ScrollingTeamContainer : Container
     {
         public event Action OnScrollStarted;
-        public event Action<Team> OnSelected;
+        public event Action<Region> OnSelected;
 
-        private readonly List<Team> availableTeams = new List<Team>();
+        private readonly List<Region> availableTeams = new List<Region>();
 
         private Container tracker;
 
@@ -151,7 +151,7 @@ namespace osu.Game.Screens.Tournament
             }
         }
 
-        public void AddTeam(Team team)
+        public void AddTeam(Region team)
         {
             if (availableTeams.Contains(team))
                 return;
@@ -162,12 +162,12 @@ namespace osu.Game.Screens.Tournament
             scrollState = ScrollState.Idle;
         }
 
-        public void AddTeams(IEnumerable<Team> teams)
+        public void AddTeams(IEnumerable<Region> teams)
         {
             if (teams == null)
                 return;
 
-            foreach (Team t in teams)
+            foreach (Region t in teams)
                 AddTeam(t);
         }
 
@@ -178,7 +178,7 @@ namespace osu.Game.Screens.Tournament
             scrollState = ScrollState.Idle;
         }
 
-        public void RemoveTeam(Team team)
+        public void RemoveTeam(Region team)
         {
             availableTeams.Remove(team);
 
@@ -319,7 +319,7 @@ namespace osu.Game.Screens.Tournament
             public const float WIDTH = 58;
             public const float HEIGHT = 41;
 
-            public Team Team;
+            public Region Team;
 
             private Sprite flagSprite;
             private Box outline;
@@ -339,7 +339,7 @@ namespace osu.Game.Screens.Tournament
                 }
             }
 
-            public ScrollingTeam(Team team)
+            public ScrollingTeam(Region team)
             {
                 Team = team;
 
diff --git a/osu.Game/Screens/Tournament/Teams/ITeamList.cs b/osu.Game/Screens/Tournament/Teams/ITeamList.cs
index a4476b64c6..b1093968cd 100644
--- a/osu.Game/Screens/Tournament/Teams/ITeamList.cs
+++ b/osu.Game/Screens/Tournament/Teams/ITeamList.cs
@@ -2,11 +2,12 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Tournament.Teams
 {
     public interface ITeamList
     {
-        IEnumerable<Team> Teams { get; }
+        IEnumerable<Region> Teams { get; }
     }
 }
diff --git a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
index 7de48dd55b..89bdb20d28 100644
--- a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
+++ b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Tournament.Teams
 {
@@ -20,11 +21,11 @@ namespace osu.Game.Screens.Tournament.Teams
             this.storage = storage;
         }
 
-        public IEnumerable<Team> Teams
+        public IEnumerable<Region> Teams
         {
             get
             {
-                var teams = new List<Team>();
+                var teams = new List<Region>();
 
                 try
                 {
@@ -52,7 +53,7 @@ namespace osu.Game.Screens.Tournament.Teams
                             string acronym = split.Length >= 3 ? split[2].Trim() : teamName;
                             acronym = acronym.Substring(0, Math.Min(3, acronym.Length));
 
-                            teams.Add(new Team()
+                            teams.Add(new Region()
                             {
                                 FlagName = flagName,
                                 FullName = teamName,
diff --git a/osu.Game/Screens/Tournament/Teams/Team.cs b/osu.Game/Screens/Tournament/Teams/Team.cs
deleted file mode 100644
index 226f35ec1d..0000000000
--- a/osu.Game/Screens/Tournament/Teams/Team.cs
+++ /dev/null
@@ -1,23 +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
-
-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/Users/Badge.cs b/osu.Game/Users/Badge.cs
new file mode 100644
index 0000000000..341d3fab1d
--- /dev/null
+++ b/osu.Game/Users/Badge.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
+
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Users
+{
+    public class Badge : IHasDrawableRepresentation<Sprite>
+    {
+        public string Name;
+        public Texture Texture; // TODO: Replace this with something better
+
+        public Sprite CreateDrawable()
+        {
+            return new Sprite
+            {
+                Texture = Texture,
+            };
+        }
+    }
+}
diff --git a/osu.Game/Users/Region.cs b/osu.Game/Users/Region.cs
new file mode 100644
index 0000000000..99ed29ba05
--- /dev/null
+++ b/osu.Game/Users/Region.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Users
+{
+    public class Region : IHasDrawableRepresentation<DrawableFlag>
+    {
+        /// <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;
+
+        public DrawableFlag CreateDrawable()
+        {
+            return new DrawableFlag(FlagName);
+        }
+    }
+
+    public class DrawableFlag : Container
+    {
+        private Sprite sprite;
+        private TextureStore textures;
+
+        private string flagName;
+        public string FlagName
+        {
+            get { return flagName; }
+            set
+            {
+                if (value == flagName) return;
+                flagName = value;
+                sprite.Texture = textures.Get($@"Flags/{flagName}");
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore ts)
+        {
+            textures = ts;
+            sprite.Texture = textures.Get($@"Flags/{flagName}");
+        }
+
+        public DrawableFlag(string name)
+        {
+            flagName = name;
+
+            Children = new Drawable[]
+            {
+                sprite = new Sprite
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 8301becc76..d6da17483c 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -1,16 +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 System.Collections.Generic;
+
 namespace osu.Game.Users
 {
     public class User
     {
         public int Id;
         public string Username;
-
-        /// <summary>
-        /// Two-letter flag acronym (ISO 3166 standard)
-        /// </summary>
-        public string FlagName;
+        public Region Region;
+        public IEnumerable<Badge> Badges;
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ad66e335eb..68d9e0f5d1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -217,7 +217,6 @@
     <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" />
@@ -311,7 +310,10 @@
     <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsRemoveFromUnplayedButton.cs" />
     <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
-    <Compile Include="Screens\Select\Leaderboards\LeaderboardScoreDisplay.cs" />
+    <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
+    <Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
+    <Compile Include="Users\Region.cs" />
+    <Compile Include="Users\Badge.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">

From 442a2c97dbcdedd6c738f6d5a7d41bf01c56a112 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Mon, 13 Mar 2017 09:44:22 -0300
Subject: [PATCH 08/94] Merge conflicts

---
 osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs       | 1 -
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs   | 1 +
 osu.Game/Screens/Tournament/ScrollingTeamContainer.cs      | 4 ++--
 osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs | 6 +-----
 osu.Game/osu.Game.csproj                                   | 3 ---
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index 44b26d46f7..860f2d7b87 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -19,7 +19,6 @@ namespace osu.Desktop.VisualTests
 {
     class TestCaseLeaderboard : TestCase
     {
-        public override string Name => @"Leaderboard";
         public override string Description => @"From song select";
 
         private Leaderboard leaderboard;
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 82eae852a4..865eb88763 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -14,6 +14,7 @@ using osu.Game.Modes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Allocation;
 using System.Linq;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
diff --git a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
index d1ac98eb95..0f3f629fd1 100644
--- a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
+++ b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
@@ -270,9 +270,9 @@ namespace osu.Game.Screens.Tournament
 
         private void addFlags()
         {
-            foreach (Team t in availableTeams)
+            foreach (Region r in availableTeams)
             {
-                Add(new ScrollingTeam(t)
+                Add(new ScrollingTeam(r)
                 {
                     X = leftPos + DrawWidth
                 });
diff --git a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
index 05c2efd7dc..76f871d202 100644
--- a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
+++ b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
@@ -53,11 +53,7 @@ namespace osu.Game.Screens.Tournament.Teams
                             string acronym = split.Length >= 3 ? split[2].Trim() : teamName;
                             acronym = acronym.Substring(0, Math.Min(3, acronym.Length));
 
-<<<<<<< HEAD
-                            teams.Add(new Region()
-=======
-                            teams.Add(new Team
->>>>>>> 6f20473e65960e059727dee5dc075fc356d07c1b
+                            teams.Add(new Region
                             {
                                 FlagName = flagName,
                                 FullName = teamName,
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index bc8244fa04..d470d9496a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -326,15 +326,12 @@
     <Compile Include="Screens\Select\Options\BeatmapOptionsEditButton.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsRemoveFromUnplayedButton.cs" />
-<<<<<<< HEAD
     <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
     <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
     <Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
     <Compile Include="Users\Region.cs" />
     <Compile Include="Users\Badge.cs" />
-=======
     <Compile Include="IO\ArchiveReader.cs" />
->>>>>>> 6f20473e65960e059727dee5dc075fc356d07c1b
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">

From 8e90e05f23e81b443ebd3ff7aab04f0bbce9417b Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Mon, 13 Mar 2017 12:31:46 -0300
Subject: [PATCH 09/94] Changed animation to match the one in Comp3 6c(will
 probably clean later), changed avatar sprite to a toolbar avatar(doesn't load
 in visual test since there's no OsuGame), removed random test case data, now
 static

---
 .../Tests/TestCaseLeaderboard.cs              | 187 ++++++++++++++++--
 .../Overlays/Toolbar/ToolbarUserButton.cs     |  23 ++-
 .../Select/Leaderboards/LeaderboardScore.cs   |  79 ++++++--
 3 files changed, 240 insertions(+), 49 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index 860f2d7b87..3ab72853b3 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -5,15 +5,13 @@ using OpenTK;
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Allocation;
 using osu.Framework.MathUtils;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Modes;
 using osu.Game.Users;
+using osu.Game.Modes.Osu;
 
 namespace osu.Desktop.VisualTests
 {
@@ -25,30 +23,181 @@ namespace osu.Desktop.VisualTests
 
         private void newScores()
         {
-            var scores = new List<Score>();
-            for (int i = 0; i < 10; i++)
+            var scores = new[]
             {
-                scores.Add(new Score
+                new Score
                 {
-                    Accuracy = Math.Round(RNG.NextDouble(0, 100), 2),
-                    MaxCombo = RNG.Next(0, 3000),
-                    TotalScore = RNG.Next(1, 1000000),
-                    Mods = Ruleset.GetRuleset(PlayMode.Osu).GetModsFor(ModType.DifficultyIncrease).ToArray(),
-                    User = new Game.Users.User
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
                     {
-                        Id = 2,
-                        Username = @"peppy",
+                        Id = 6602580,
+                        Username = @"waaiiru",
                         Region = new Region
                         {
-                            FullName = @"Australia",
-                            Acronym = @"AUS",
-                            FlagName = @"AU",
+                            FullName = @"Spain",
+                            FlagName = @"ES",
                         },
                     },
-                });
-            }
+                },
+                new Score
+                {
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 4608074,
+                        Username = @"Skycries",
+                        Region = new Region
+                        {
+                            FullName = @"Brazil",
+                            FlagName = @"BR",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 1014222,
+                        Username = @"eLy",
+                        Region = new Region
+                        {
+                            FullName = @"Japan",
+                            FlagName = @"JP",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 1541390,
+                        Username = @"Toukai",
+                        Region = new Region
+                        {
+                            FullName = @"Canada",
+                            FlagName = @"CA",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 2243452,
+                        Username = @"Satoruu",
+                        Region = new Region
+                        {
+                            FullName = @"Venezuela",
+                            FlagName = @"VE",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 2705430,
+                        Username = @"Mooha",
+                        Region = new Region
+                        {
+                            FullName = @"France",
+                            FlagName = @"FR",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 7151382,
+                        Username = @"Mayuri Hana",
+                        Region = new Region
+                        {
+                            FullName = @"Thailand",
+                            FlagName = @"TH",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 2051389,
+                        Username = @"FunOrange",
+                        Region = new Region
+                        {
+                            FullName = @"Canada",
+                            FlagName = @"CA",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 6169483,
+                        Username = @"-Hebel-",
+                        Region = new Region
+                        {
+                            FullName = @"Mexico",
+                            FlagName = @"MX",
+                        },
+                    },
+                },
+                new Score
+                {
+                    Accuracy = 100,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    User = new User
+                    {
+                        Id = 6702666,
+                        Username = @"prhtnsm",
+                        Region = new Region
+                        {
+                            FullName = @"Germany",
+                            FlagName = @"DE",
+                        },
+                    },
+                },
+            };
 
-            leaderboard.Scores = scores.ToArray();
+            leaderboard.Scores = scores;
         }
 
         public override void Reset()
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index 89af56c18c..30dd70ce03 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Overlays.Toolbar
                 Masking = true;
             }
 
-            [BackgroundDependencyLoader]
+            [BackgroundDependencyLoader(permitNulls:true)]
             private void load(OsuGame game, TextureStore textures)
             {
                 this.game = game;
@@ -98,18 +98,21 @@ namespace osu.Game.Overlays.Toolbar
 
                     newSprite.FillMode = FillMode.Fit;
 
-                    newSprite.LoadAsync(game, s =>
+                    if (game != null)
                     {
-                        Sprite?.FadeOut();
-                        Sprite?.Expire();
-                        Sprite = s;
+                        newSprite.LoadAsync(game, s =>
+                        {
+                            Sprite?.FadeOut();
+                            Sprite?.Expire();
+                            Sprite = s;
 
-                        Add(s);
+                            Add(s);
 
-                        //todo: fix this... clock dependencies are a pain
-                        if (s.Clock != null)
-                            s.FadeInFromZero(200);
-                    });
+                            //todo: fix this... clock dependencies are a pain
+                            if (s.Clock != null)
+                                s.FadeInFromZero(200);
+                        });
+                    }
                 }
             }
 
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 865eb88763..e26e366c3a 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -34,19 +34,17 @@ namespace osu.Game.Screens.Select.Leaderboards
         };
 
         private Box background;
-        private Container content;
-        private Sprite avatar;
+        private Container content, avatarContainer;
+        private Sprite scoreLetter;
+        private OsuSpriteText nameLabel;
+        private GlowingSpriteText scoreLabel;
+        private ScoreComponentLabel maxCombo, accuracy;
+        private Container flagBadgeContainer;
         private FillFlowContainer<ScoreModIcon> modsContainer;
 
         private readonly int index;
         public readonly Score Score;
 
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            avatar.Texture = textures.Get($@"https://a.ppy.sh/{Score.User.Id}") ?? textures.Get(@"Online/avatar-guest");
-        }
-
         protected override bool OnHover(Framework.Input.InputState state)
         {
             background.FadeTo(0.5f, 300, EasingTypes.OutQuint);
@@ -63,14 +61,51 @@ namespace osu.Game.Screens.Select.Leaderboards
         {
             base.LoadComplete();
 
-            // TODO: This is hacky, find a better way
+            // TODO: This fade to 0.01 is hacky, find a better way
             FadeTo(0.01f);
-            content.MoveToX(DrawSize.X);
+
+            foreach (Drawable d in new Drawable[] { avatarContainer, nameLabel, scoreLabel, scoreLetter, flagBadgeContainer, maxCombo, accuracy, modsContainer, })
+            {
+                d.FadeOut();
+            }
+
+            content.MoveToY(75);
+            avatarContainer.MoveToX(75);
+            nameLabel.MoveToX(150);
+
             Delay(index * 50);
             Schedule(() =>
             {
-                FadeInFromZero(200);
-                content.MoveToX(0, 500, EasingTypes.OutQuint);
+                FadeIn(200);
+                content.MoveToY(0, 400, EasingTypes.OutQuint);
+
+                Delay(100);
+                Schedule(() =>
+                {
+                    avatarContainer.FadeIn(300, EasingTypes.OutQuint);
+                    nameLabel.FadeIn(350, EasingTypes.OutQuint);
+
+                    avatarContainer.MoveToX(0, 300, EasingTypes.OutQuint);
+                    nameLabel.MoveToX(0, 350, EasingTypes.OutQuint);
+
+                    Delay(250);
+                    Schedule(() =>
+                    {
+                        scoreLabel.FadeIn(200);
+                        scoreLetter.FadeIn(200);
+
+                        Delay(50);
+                        Schedule(() =>
+                        {
+                            var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, };
+
+                            for (int i = 0; i < drawables.Length; i++)
+                            {
+                                drawables[i].FadeIn(200 + (i * 50));
+                            }
+                        });
+                    });
+                });
             });
         }
 
@@ -131,7 +166,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                             Padding = new MarginPadding(edge_margin),
                             Children = new Drawable[]
                             {
-                                new Container
+                                avatarContainer = new Container
                                 {
                                     Size = new Vector2(height - edge_margin * 2, height - edge_margin * 2),
                                     CornerRadius = corner_radius,
@@ -139,9 +174,11 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     EdgeEffect = imageShadow,
                                     Children = new Drawable[]
                                     {
-                                        avatar = new Sprite
+                                        new Overlays.Toolbar.ToolbarUserButton.Avatar
                                         {
                                             RelativeSizeAxes = Axes.Both,
+                                            UserId = Score.User.Id,
+                                            Masking = false,
                                         },
                                     },
                                 },
@@ -152,7 +189,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     Position = new Vector2(height - edge_margin, 0f),
                                     Children = new Drawable[]
                                     {
-                                        new OsuSpriteText
+                                        nameLabel = new OsuSpriteText
                                         {
                                             Text = Score.User?.Username,
                                             Font = @"Exo2.0-BoldItalic",
@@ -167,7 +204,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                             Spacing = new Vector2(10f, 0f),
                                             Children = new Drawable[]
                                             {
-                                                new Container
+                                                flagBadgeContainer = new Container
                                                 {
                                                     Size = new Vector2(87f, 20f),
                                                     Masking = true,
@@ -184,21 +221,21 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                     Margin = new MarginPadding { Left = 10, },
                                                     Children = new Drawable[]
                                                     {
-                                                        new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.MaxCombo.ToString()),
-                                                        new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.Accuracy.ToString()),
+                                                        maxCombo = new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.MaxCombo.ToString()),
+                                                        accuracy = new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.Accuracy.ToString()),
                                                     },
                                                 },
                                             },
                                         },
                                     },
                                 },
-                                new Sprite
+                                scoreLetter = new Sprite
                                 {
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
                                     Size = new Vector2(score_letter_size),
                                 },
-                                new GlowingSpriteText(string.Format("{0:n0}", Score.TotalScore), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
+                                scoreLabel = new GlowingSpriteText(string.Format("{0:n0}", Score.TotalScore), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
                                 {
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
@@ -313,6 +350,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                 {
                     new TextAwesome
                     {
+                        Origin = Anchor.Centre,
                         Icon = FontAwesome.fa_square,
                         Colour = OsuColour.FromHex(@"3087ac"),
                         Rotation = 45,
@@ -320,6 +358,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                     },
                     new TextAwesome
                     {
+                        Origin = Anchor.Centre,
                         Icon = icon,
                         Colour = OsuColour.FromHex(@"a4edff"),
                         Scale = new Vector2(0.8f),

From 74eddc768a21f34c4de7500a948eefbad530e591 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Mon, 13 Mar 2017 13:02:56 -0300
Subject: [PATCH 10/94] Random diff

---
 osu.Game/Overlays/ChatOverlay.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index b3fa9d94c7..efd366adb1 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -97,8 +97,6 @@ namespace osu.Game.Overlays
             if (!string.IsNullOrEmpty(postText))
             {
                 //todo: actually send to server
-
-
                 careChannels.FirstOrDefault()?.AddNewMessages(new[]
                             {
                                 new Message

From 6bd9e3cac13fffefedaf3c44dae92120739066ef Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Mon, 13 Mar 2017 18:34:43 -0300
Subject: [PATCH 11/94] +Score ranks

---
 .../Tests/TestCaseLeaderboard.cs              | 10 ++++++
 osu.Game/Modes/Score.cs                       | 36 +++++++++++++++++--
 .../Select/Leaderboards/LeaderboardScore.cs   | 22 ++++++++----
 3 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index 3ab72853b3..260f7fc8cc 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -27,6 +27,7 @@ namespace osu.Desktop.VisualTests
             {
                 new Score
                 {
+                    Rank = ScoreRank.SSPlus,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -44,6 +45,7 @@ namespace osu.Desktop.VisualTests
                 },
                 new Score
                 {
+                    Rank = ScoreRank.SS,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -61,6 +63,7 @@ namespace osu.Desktop.VisualTests
                 },
                 new Score
                 {
+                    Rank = ScoreRank.SPlus,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -78,6 +81,7 @@ namespace osu.Desktop.VisualTests
                 },
                 new Score
                 {
+                    Rank = ScoreRank.S,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -95,6 +99,7 @@ namespace osu.Desktop.VisualTests
                 },
                 new Score
                 {
+                    Rank = ScoreRank.A,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -112,6 +117,7 @@ namespace osu.Desktop.VisualTests
                 },
                 new Score
                 {
+                    Rank = ScoreRank.B,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -129,6 +135,7 @@ namespace osu.Desktop.VisualTests
                 },
                 new Score
                 {
+                    Rank = ScoreRank.C,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -146,6 +153,7 @@ namespace osu.Desktop.VisualTests
                 },
                 new Score
                 {
+                    Rank = ScoreRank.D,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -163,6 +171,7 @@ namespace osu.Desktop.VisualTests
                 },
                 new Score
                 {
+                    Rank = ScoreRank.F,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -180,6 +189,7 @@ namespace osu.Desktop.VisualTests
                 },
                 new Score
                 {
+                    Rank = ScoreRank.F,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
diff --git a/osu.Game/Modes/Score.cs b/osu.Game/Modes/Score.cs
index 8a6a38d906..bf93605605 100644
--- a/osu.Game/Modes/Score.cs
+++ b/osu.Game/Modes/Score.cs
@@ -3,20 +3,52 @@
 
 using osu.Game.Users;
 using osu.Game.Database;
+using System.ComponentModel;
 
 namespace osu.Game.Modes
 {
     public class Score
     {
+        public ScoreRank Rank { get; set; }
         public double TotalScore { get; set; }
         public double Accuracy { get; set; }
         public double Health { get; set; }
-        public Mod[] Mods { get; set; }
-        public User User { get; set; }
         public int MaxCombo { get; set; }
         public int Combo { get; set; }
+        public Mod[] Mods { get; set; }
 
+        public User User { get; set; }
         public Replay Replay;
         public BeatmapInfo Beatmap;
     }
+
+    public enum ScoreRank
+    {
+        [Description(@"F")]
+        F,
+
+        [Description(@"F")]
+        D,
+
+        [Description(@"C")]
+        C,
+
+        [Description(@"B")]
+        B,
+
+        [Description(@"A")]
+        A,
+
+        [Description(@"S")]
+        S,
+
+        [Description(@"SPlus")]
+        SPlus,
+
+        [Description(@"SS")]
+        SS,
+
+        [Description(@"SSPlus")]
+        SSPlus,
+    }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index e26e366c3a..c16286332a 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Allocation;
 using System.Linq;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
@@ -24,7 +25,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         private const float corner_radius = 5;
         private const float edge_margin = 10;
         private const float background_alpha = 0.25f;
-        private const float score_letter_size = 20f;
+        private const float score_rank_size = 30f;
 
         private readonly EdgeEffect imageShadow = new EdgeEffect
         {
@@ -35,7 +36,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private Box background;
         private Container content, avatarContainer;
-        private Sprite scoreLetter;
+        private Sprite scoreRank;
         private OsuSpriteText nameLabel;
         private GlowingSpriteText scoreLabel;
         private ScoreComponentLabel maxCombo, accuracy;
@@ -57,6 +58,12 @@ namespace osu.Game.Screens.Select.Leaderboards
             base.OnHoverLost(state);
         }
 
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            scoreRank.Texture = textures.Get($@"Badges/ScoreRanks/{Score.Rank.GetDescription()}");
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -64,7 +71,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             // TODO: This fade to 0.01 is hacky, find a better way
             FadeTo(0.01f);
 
-            foreach (Drawable d in new Drawable[] { avatarContainer, nameLabel, scoreLabel, scoreLetter, flagBadgeContainer, maxCombo, accuracy, modsContainer, })
+            foreach (Drawable d in new Drawable[] { avatarContainer, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer, })
             {
                 d.FadeOut();
             }
@@ -92,7 +99,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                     Schedule(() =>
                     {
                         scoreLabel.FadeIn(200);
-                        scoreLetter.FadeIn(200);
+                        scoreRank.FadeIn(200);
 
                         Delay(50);
                         Schedule(() =>
@@ -229,17 +236,18 @@ namespace osu.Game.Screens.Select.Leaderboards
                                         },
                                     },
                                 },
-                                scoreLetter = new Sprite
+                                scoreRank = new Sprite
                                 {
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
-                                    Size = new Vector2(score_letter_size),
+                                    Size = new Vector2(score_rank_size),
+                                    Position = new Vector2(0f, -5f),
                                 },
                                 scoreLabel = new GlowingSpriteText(string.Format("{0:n0}", Score.TotalScore), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
                                 {
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
-                                    Position = new Vector2(-score_letter_size - 5f, 0f),
+                                    Position = new Vector2(-score_rank_size - 5f, 0f),
                                 },
                                 modsContainer = new FillFlowContainer<ScoreModIcon>
                                 {

From d53f21905161925cf8d56914b604d97f323d09c8 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 14 Mar 2017 10:04:42 -0300
Subject: [PATCH 12/94] Adjusted score rank size

---
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index c16286332a..594a674322 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         private const float corner_radius = 5;
         private const float edge_margin = 10;
         private const float background_alpha = 0.25f;
-        private const float score_rank_size = 30f;
+        private const float score_rank_size = 40f;
 
         private readonly EdgeEffect imageShadow = new EdgeEffect
         {
@@ -241,7 +241,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
                                     Size = new Vector2(score_rank_size),
-                                    Position = new Vector2(0f, -5f),
+                                    Position = new Vector2(0f, -10f),
                                 },
                                 scoreLabel = new GlowingSpriteText(string.Format("{0:n0}", Score.TotalScore), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
                                 {

From 2e8b1ad390d63e69bc5dbec294e672f7d04e585a Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 14 Mar 2017 10:09:58 -0300
Subject: [PATCH 13/94] Woops

---
 osu.Game/osu.Game.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b68c3511dc..a14398d367 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -328,6 +328,7 @@
     <Compile Include="Screens\Select\Options\BeatmapOptionsEditButton.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsRemoveFromUnplayedButton.cs" />
+    <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
     <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
     <Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
     <Compile Include="Users\Region.cs" />

From 12326f610e89e499c466e1d7e76309e5f1353149 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Mar 2017 22:11:29 +0900
Subject: [PATCH 14/94] Adjust transition to flyte's liking.

---
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 594a674322..56ff736681 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             Schedule(() =>
             {
                 FadeIn(200);
-                content.MoveToY(0, 400, EasingTypes.OutQuint);
+                content.MoveToY(0, 800, EasingTypes.OutQuint);
 
                 Delay(100);
                 Schedule(() =>
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
                             for (int i = 0; i < drawables.Length; i++)
                             {
-                                drawables[i].FadeIn(200 + (i * 50));
+                                drawables[i].FadeIn(100 + (i * 50));
                             }
                         });
                     });

From 8176b4ef77c5afa4214f1e638af4ce4e277eaef5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Mar 2017 22:11:38 +0900
Subject: [PATCH 15/94] Fix merge errors.

---
 osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs     | 2 ++
 osu.Game/Modes/Score.cs                                  | 1 +
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 1 +
 3 files changed, 4 insertions(+)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index 260f7fc8cc..18710432bf 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -10,8 +10,10 @@ using osu.Framework.Graphics;
 using osu.Framework.MathUtils;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Modes;
+using osu.Game.Modes.Mods;
 using osu.Game.Users;
 using osu.Game.Modes.Osu;
+using osu.Game.Modes.Osu.Mods;
 
 namespace osu.Desktop.VisualTests
 {
diff --git a/osu.Game/Modes/Score.cs b/osu.Game/Modes/Score.cs
index bf93605605..025eca9ab8 100644
--- a/osu.Game/Modes/Score.cs
+++ b/osu.Game/Modes/Score.cs
@@ -4,6 +4,7 @@
 using osu.Game.Users;
 using osu.Game.Database;
 using System.ComponentModel;
+using osu.Game.Modes.Mods;
 
 namespace osu.Game.Modes
 {
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 56ff736681..90d28bc0bf 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -16,6 +16,7 @@ using osu.Framework.Allocation;
 using System.Linq;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions;
+using osu.Game.Modes.Mods;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {

From 650fc7563d1c2a09c331798f47ab18d3aef94118 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 14 Mar 2017 10:58:28 -0300
Subject: [PATCH 16/94] ScoreRank, Avatar to own files, +DrawableRank

---
 osu.Game/Modes/Score.cs                       | 31 ------
 osu.Game/Modes/ScoreRank.cs                   | 37 +++++++
 .../Overlays/Toolbar/ToolbarUserButton.cs     | 92 +----------------
 .../Select/Leaderboards/DrawableRank.cs       | 51 ++++++++++
 .../Select/Leaderboards/LeaderboardScore.cs   | 14 +--
 osu.Game/Users/Avatar.cs                      | 99 +++++++++++++++++++
 osu.Game/osu.Game.csproj                      |  3 +
 7 files changed, 195 insertions(+), 132 deletions(-)
 create mode 100644 osu.Game/Modes/ScoreRank.cs
 create mode 100644 osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
 create mode 100644 osu.Game/Users/Avatar.cs

diff --git a/osu.Game/Modes/Score.cs b/osu.Game/Modes/Score.cs
index 025eca9ab8..f42dc7f7d4 100644
--- a/osu.Game/Modes/Score.cs
+++ b/osu.Game/Modes/Score.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Users;
 using osu.Game.Database;
-using System.ComponentModel;
 using osu.Game.Modes.Mods;
 
 namespace osu.Game.Modes
@@ -22,34 +21,4 @@ namespace osu.Game.Modes
         public Replay Replay;
         public BeatmapInfo Beatmap;
     }
-
-    public enum ScoreRank
-    {
-        [Description(@"F")]
-        F,
-
-        [Description(@"F")]
-        D,
-
-        [Description(@"C")]
-        C,
-
-        [Description(@"B")]
-        B,
-
-        [Description(@"A")]
-        A,
-
-        [Description(@"S")]
-        S,
-
-        [Description(@"SPlus")]
-        SPlus,
-
-        [Description(@"SS")]
-        SS,
-
-        [Description(@"SSPlus")]
-        SSPlus,
-    }
 }
diff --git a/osu.Game/Modes/ScoreRank.cs b/osu.Game/Modes/ScoreRank.cs
new file mode 100644
index 0000000000..d25fe8ab1f
--- /dev/null
+++ b/osu.Game/Modes/ScoreRank.cs
@@ -0,0 +1,37 @@
+// 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 ScoreRank
+    {
+        [Description(@"F")]
+        F,
+
+        [Description(@"F")]
+        D,
+
+        [Description(@"C")]
+        C,
+
+        [Description(@"B")]
+        B,
+
+        [Description(@"A")]
+        A,
+
+        [Description(@"S")]
+        S,
+
+        [Description(@"SPlus")]
+        SPlus,
+
+        [Description(@"SS")]
+        SS,
+
+        [Description(@"SSPlus")]
+        SSPlus,
+    }
+}
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index 30dd70ce03..e8fc40825d 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -1,16 +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 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;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Online.API;
-using OpenTK;
-using OpenTK.Graphics;
+using osu.Game.Users;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -49,89 +43,5 @@ namespace osu.Game.Overlays.Toolbar
                     break;
             }
         }
-
-        public class Avatar : Container
-        {
-            public Drawable Sprite;
-
-            private int userId;
-            private OsuGame game;
-            private Texture guestTexture;
-
-            public Avatar()
-            {
-                Size = new Vector2(32);
-                Anchor = Anchor.CentreLeft;
-                Origin = Anchor.CentreLeft;
-
-                CornerRadius = Size.X / 8;
-
-                EdgeEffect = new EdgeEffect
-                {
-                    Type = EdgeEffectType.Shadow,
-                    Radius = 4,
-                    Colour = Color4.Black.Opacity(0.1f),
-                };
-
-                Masking = true;
-            }
-
-            [BackgroundDependencyLoader(permitNulls:true)]
-            private void load(OsuGame game, TextureStore textures)
-            {
-                this.game = game;
-
-                guestTexture = textures.Get(@"Online/avatar-guest");
-            }
-
-            public int UserId
-            {
-                get { return userId; }
-                set
-                {
-                    if (userId == value)
-                        return;
-
-                    userId = value;
-
-                    var newSprite = userId > 1 ? new OnlineSprite($@"https://a.ppy.sh/{userId}") : new Sprite { Texture = guestTexture };
-
-                    newSprite.FillMode = FillMode.Fit;
-
-                    if (game != null)
-                    {
-                        newSprite.LoadAsync(game, s =>
-                        {
-                            Sprite?.FadeOut();
-                            Sprite?.Expire();
-                            Sprite = s;
-
-                            Add(s);
-
-                            //todo: fix this... clock dependencies are a pain
-                            if (s.Clock != null)
-                                s.FadeInFromZero(200);
-                        });
-                    }
-                }
-            }
-
-            public class OnlineSprite : Sprite
-            {
-                private readonly string url;
-
-                public OnlineSprite(string url)
-                {
-                    Debug.Assert(url != null);
-                    this.url = url;
-                }
-
-                [BackgroundDependencyLoader]
-                private void load(TextureStore textures)
-                {
-                    Texture = textures.Get(url);
-                }
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs b/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
new file mode 100644
index 0000000000..23f33a205b
--- /dev/null
+++ b/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
@@ -0,0 +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 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.Extensions;
+using osu.Game.Modes;
+
+namespace osu.Game.Screens.Select.Leaderboards
+{
+    public class DrawableRank : Container
+    {
+        private Sprite sprite;
+        private TextureStore textures;
+
+        private ScoreRank rank;
+        public ScoreRank Rank
+        {
+            get { return rank; }
+            set
+            {
+                if (value == rank) return;
+                rank = value;
+                sprite.Texture = textures.Get($@"Badges/ScoreRanks/{rank.GetDescription()}");
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore ts)
+        {
+            textures = ts;
+            sprite.Texture = textures.Get($@"Badges/ScoreRanks/{rank.GetDescription()}");
+        }
+
+        public DrawableRank(ScoreRank rank)
+        {
+            this.rank = rank;
+
+            Children = new Drawable[]
+            {
+                sprite = new Sprite
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 90d28bc0bf..573365cdd2 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -13,10 +13,10 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Allocation;
-using System.Linq;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions;
 using osu.Game.Modes.Mods;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private Box background;
         private Container content, avatarContainer;
-        private Sprite scoreRank;
+        private DrawableRank scoreRank;
         private OsuSpriteText nameLabel;
         private GlowingSpriteText scoreLabel;
         private ScoreComponentLabel maxCombo, accuracy;
@@ -59,12 +59,6 @@ namespace osu.Game.Screens.Select.Leaderboards
             base.OnHoverLost(state);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
-        {
-            scoreRank.Texture = textures.Get($@"Badges/ScoreRanks/{Score.Rank.GetDescription()}");
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -182,7 +176,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     EdgeEffect = imageShadow,
                                     Children = new Drawable[]
                                     {
-                                        new Overlays.Toolbar.ToolbarUserButton.Avatar
+                                        new Avatar
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                             UserId = Score.User.Id,
@@ -237,7 +231,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                         },
                                     },
                                 },
-                                scoreRank = new Sprite
+                                scoreRank = new DrawableRank(Score.Rank)
                                 {
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
diff --git a/osu.Game/Users/Avatar.cs b/osu.Game/Users/Avatar.cs
new file mode 100644
index 0000000000..7a44d8601c
--- /dev/null
+++ b/osu.Game/Users/Avatar.cs
@@ -0,0 +1,99 @@
+// 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 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.Textures;
+
+namespace osu.Game.Users
+{
+    public class Avatar : Container
+    {
+        public Drawable Sprite;
+
+        private int userId;
+        private OsuGame game;
+        private Texture guestTexture;
+
+        public Avatar()
+        {
+            Size = new Vector2(32);
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+
+            CornerRadius = Size.X / 8;
+
+            EdgeEffect = new EdgeEffect
+            {
+                Type = EdgeEffectType.Shadow,
+                Radius = 4,
+                Colour = Color4.Black.Opacity(0.1f),
+            };
+
+            Masking = true;
+        }
+
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(OsuGame game, TextureStore textures)
+        {
+            this.game = game;
+
+            guestTexture = textures.Get(@"Online/avatar-guest");
+        }
+
+        public int UserId
+        {
+            get { return userId; }
+            set
+            {
+                if (userId == value)
+                    return;
+
+                userId = value;
+
+                var newSprite = userId > 1 ? new OnlineSprite($@"https://a.ppy.sh/{userId}") : new Sprite { Texture = guestTexture };
+
+                newSprite.FillMode = FillMode.Fit;
+
+                if (game != null)
+                {
+                    newSprite.LoadAsync(game, s =>
+                    {
+                        Sprite?.FadeOut();
+                        Sprite?.Expire();
+                        Sprite = s;
+
+                        Add(s);
+
+                            //todo: fix this... clock dependencies are a pain
+                            if (s.Clock != null)
+                            s.FadeInFromZero(200);
+                    });
+                }
+            }
+        }
+
+        public class OnlineSprite : Sprite
+        {
+            private readonly string url;
+
+            public OnlineSprite(string url)
+            {
+                Debug.Assert(url != null);
+                this.url = url;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                Texture = textures.Get(url);
+            }
+        }
+    }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index a14398d367..0d8ce9d4b9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -333,6 +333,9 @@
     <Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
     <Compile Include="Users\Region.cs" />
     <Compile Include="Users\Badge.cs" />
+    <Compile Include="Modes\ScoreRank.cs" />
+    <Compile Include="Users\Avatar.cs" />
+    <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">

From 322446effe35df553cc9a226f04af2c098fa1198 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 14 Mar 2017 11:11:23 -0300
Subject: [PATCH 17/94] -Unused usings

---
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 3 ---
 osu.Game/Screens/Select/PlaySongSelect.cs                | 1 -
 osu.Game/Screens/Tournament/Group.cs                     | 1 -
 osu.Game/Screens/Tournament/GroupContainer.cs            | 1 -
 4 files changed, 6 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 573365cdd2..b04bfff4f4 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -11,10 +11,7 @@ using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Extensions;
 using osu.Game.Modes.Mods;
 using osu.Game.Users;
 
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 943084b9f2..09ba794122 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -30,7 +30,6 @@ using osu.Framework.Threading;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays;
 using osu.Game.Screens.Select.Options;
-using osu.Game.Screens.Select.Leaderboards;
 
 namespace osu.Game.Screens.Select
 {
diff --git a/osu.Game/Screens/Tournament/Group.cs b/osu.Game/Screens/Tournament/Group.cs
index 870b297bac..d1fb6ab18c 100644
--- a/osu.Game/Screens/Tournament/Group.cs
+++ b/osu.Game/Screens/Tournament/Group.cs
@@ -11,7 +11,6 @@ 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;
 using osu.Game.Users;
diff --git a/osu.Game/Screens/Tournament/GroupContainer.cs b/osu.Game/Screens/Tournament/GroupContainer.cs
index e27f4e4f65..b99819fe4f 100644
--- a/osu.Game/Screens/Tournament/GroupContainer.cs
+++ b/osu.Game/Screens/Tournament/GroupContainer.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using System.Text;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Screens.Tournament.Teams;
 using OpenTK;
 using osu.Game.Users;
 

From ebe48b7c24e41cd4f5921c86ad21b6126035478f Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 14 Mar 2017 11:14:27 -0300
Subject: [PATCH 18/94] Removed D rank

---
 .../Tests/TestCaseLeaderboard.cs               |  2 +-
 osu.Game/Modes/ScoreRank.cs                    | 18 ------------------
 .../Select/Leaderboards/DrawableRank.cs        |  5 +++--
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index 18710432bf..ad3249081b 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -155,7 +155,7 @@ namespace osu.Desktop.VisualTests
                 },
                 new Score
                 {
-                    Rank = ScoreRank.D,
+                    Rank = ScoreRank.F,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
diff --git a/osu.Game/Modes/ScoreRank.cs b/osu.Game/Modes/ScoreRank.cs
index d25fe8ab1f..98e4eda6ff 100644
--- a/osu.Game/Modes/ScoreRank.cs
+++ b/osu.Game/Modes/ScoreRank.cs
@@ -7,31 +7,13 @@ namespace osu.Game.Modes
 {
     public enum ScoreRank
     {
-        [Description(@"F")]
         F,
-
-        [Description(@"F")]
-        D,
-
-        [Description(@"C")]
         C,
-
-        [Description(@"B")]
         B,
-
-        [Description(@"A")]
         A,
-
-        [Description(@"S")]
         S,
-
-        [Description(@"SPlus")]
         SPlus,
-
-        [Description(@"SS")]
         SS,
-
-        [Description(@"SSPlus")]
         SSPlus,
     }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs b/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
index 23f33a205b..1c96a4363e 100644
--- a/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Extensions;
 using osu.Game.Modes;
+using System;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
@@ -24,7 +25,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             {
                 if (value == rank) return;
                 rank = value;
-                sprite.Texture = textures.Get($@"Badges/ScoreRanks/{rank.GetDescription()}");
+                sprite.Texture = textures.Get($@"Badges/ScoreRanks/{Enum.GetName(typeof(ScoreRank), rank)}");
             }
         }
 
@@ -32,7 +33,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         private void load(TextureStore ts)
         {
             textures = ts;
-            sprite.Texture = textures.Get($@"Badges/ScoreRanks/{rank.GetDescription()}");
+            sprite.Texture = textures.Get($@"Badges/ScoreRanks/{Enum.GetName(typeof(ScoreRank), rank)}");
         }
 
         public DrawableRank(ScoreRank rank)

From 78aedb4518903cdbc886a02ad68b2b1e1bf6c645 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 14 Mar 2017 11:17:06 -0300
Subject: [PATCH 19/94] Test case usings

---
 osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index ad3249081b..e8b14d8a6d 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -2,18 +2,13 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
-using osu.Game.Screens.Select.Leaderboards;
+using osu.Framework.Screens.Testing;
 using osu.Game.Modes;
 using osu.Game.Modes.Mods;
-using osu.Game.Users;
-using osu.Game.Modes.Osu;
 using osu.Game.Modes.Osu.Mods;
+using osu.Game.Screens.Select.Leaderboards;
+using osu.Game.Users;
 
 namespace osu.Desktop.VisualTests
 {

From 4c03b62a7597921972c8d1c2a43a97554c9b77df Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 14 Mar 2017 11:23:48 -0300
Subject: [PATCH 20/94] More usings

---
 osu.Game/Modes/ScoreRank.cs                          | 2 --
 osu.Game/Screens/Select/Leaderboards/DrawableRank.cs | 1 -
 2 files changed, 3 deletions(-)

diff --git a/osu.Game/Modes/ScoreRank.cs b/osu.Game/Modes/ScoreRank.cs
index 98e4eda6ff..3e14384770 100644
--- a/osu.Game/Modes/ScoreRank.cs
+++ b/osu.Game/Modes/ScoreRank.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 System.ComponentModel;
-
 namespace osu.Game.Modes
 {
     public enum ScoreRank
diff --git a/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs b/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
index 1c96a4363e..048ce50de8 100644
--- a/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Extensions;
 using osu.Game.Modes;
 using System;
 

From 55187a8380811c07a2e7ebfab33d55f7a95cd3ea Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 14 Mar 2017 11:55:19 -0300
Subject: [PATCH 21/94] Warnings, accuracy formatting

---
 .../Tests/TestCaseLeaderboard.cs                 | 16 ++++++++--------
 .../Select/Leaderboards/LeaderboardScore.cs      | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index e8b14d8a6d..0396a2d81b 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -10,9 +10,9 @@ using osu.Game.Modes.Osu.Mods;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Users;
 
-namespace osu.Desktop.VisualTests
+namespace osu.Desktop.VisualTests.Tests
 {
-    class TestCaseLeaderboard : TestCase
+    internal class TestCaseLeaderboard : TestCase
     {
         public override string Description => @"From song select";
 
@@ -115,7 +115,7 @@ namespace osu.Desktop.VisualTests
                 new Score
                 {
                     Rank = ScoreRank.B,
-                    Accuracy = 100,
+                    Accuracy = 98.26,
                     MaxCombo = 244,
                     TotalScore = 1707827,
                     Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
@@ -133,7 +133,7 @@ namespace osu.Desktop.VisualTests
                 new Score
                 {
                     Rank = ScoreRank.C,
-                    Accuracy = 100,
+                    Accuracy = 96.54,
                     MaxCombo = 244,
                     TotalScore = 1707827,
                     Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
@@ -151,7 +151,7 @@ namespace osu.Desktop.VisualTests
                 new Score
                 {
                     Rank = ScoreRank.F,
-                    Accuracy = 100,
+                    Accuracy = 60.25,
                     MaxCombo = 244,
                     TotalScore = 1707827,
                     Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
@@ -169,7 +169,7 @@ namespace osu.Desktop.VisualTests
                 new Score
                 {
                     Rank = ScoreRank.F,
-                    Accuracy = 100,
+                    Accuracy = 51.40,
                     MaxCombo = 244,
                     TotalScore = 1707827,
                     Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
@@ -187,7 +187,7 @@ namespace osu.Desktop.VisualTests
                 new Score
                 {
                     Rank = ScoreRank.F,
-                    Accuracy = 100,
+                    Accuracy = 42.22,
                     MaxCombo = 244,
                     TotalScore = 1707827,
                     Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
@@ -218,7 +218,7 @@ namespace osu.Desktop.VisualTests
                 Size = new Vector2(550f, 450f),
             });
 
-            AddButton(@"New Scores", () => newScores());
+            AddButton(@"New Scores", newScores);
             newScores();
         }
     }
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index b04bfff4f4..4cc334c144 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
                             for (int i = 0; i < drawables.Length; i++)
                             {
-                                drawables[i].FadeIn(100 + (i * 50));
+                                drawables[i].FadeIn(100 + i * 50);
                             }
                         });
                     });
@@ -221,7 +221,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                     Children = new Drawable[]
                                                     {
                                                         maxCombo = new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.MaxCombo.ToString()),
-                                                        accuracy = new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.Accuracy.ToString()),
+                                                        accuracy = new ScoreComponentLabel(FontAwesome.fa_circle_o, string.Format(Score.Accuracy % 1 == 0 ? "{0:0}" : "{0:0.00}", Score.Accuracy)),
                                                     },
                                                 },
                                             },
@@ -263,7 +263,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             }
         }
 
-        class GlowingSpriteText : Container
+        private class GlowingSpriteText : Container
         {
             public GlowingSpriteText(string text, string font, int textSize, Color4 textColour, Color4 glowColour)
             {
@@ -308,7 +308,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             }
         }
 
-        class ScoreModIcon : Container
+        private class ScoreModIcon : Container
         {
             public ScoreModIcon(FontAwesome icon, Color4 colour)
             {
@@ -337,7 +337,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             }
         }
 
-        class ScoreComponentLabel : Container
+        private class ScoreComponentLabel : Container
         {
             public ScoreComponentLabel(FontAwesome icon, string value)
             {

From 94c2734b091eb4a7b569473e1d2bebe59893671c Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 14 Mar 2017 12:15:19 -0300
Subject: [PATCH 22/94] More warnings

---
 osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs | 2 +-
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs b/osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs
index 0dfddddb3f..f0265f485d 100644
--- a/osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs
+++ b/osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs
@@ -5,7 +5,7 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public interface IHasDrawableRepresentation<T> where T : Drawable
+    public interface IHasDrawableRepresentation<out T> where T : Drawable
     {
         T CreateDrawable();
     }
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 4cc334c144..44274100d5 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -235,7 +235,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     Size = new Vector2(score_rank_size),
                                     Position = new Vector2(0f, -10f),
                                 },
-                                scoreLabel = new GlowingSpriteText(string.Format("{0:n0}", Score.TotalScore), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
+                                scoreLabel = new GlowingSpriteText(Score.TotalScore.ToString("N0"), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
                                 {
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,

From 09cb0d6bbc92d481069d7c63293f44948fb40707 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 14 Mar 2017 12:58:22 -0300
Subject: [PATCH 23/94] Proper icons

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs      | 2 +-
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 6acdc17996..918be4f43a 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -1,8 +1,8 @@
 // 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 System.Collections.Generic;
+using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Modes;
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 44274100d5..c647709388 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -220,8 +220,8 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                     Margin = new MarginPadding { Left = 10, },
                                                     Children = new Drawable[]
                                                     {
-                                                        maxCombo = new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.MaxCombo.ToString()),
-                                                        accuracy = new ScoreComponentLabel(FontAwesome.fa_circle_o, string.Format(Score.Accuracy % 1 == 0 ? "{0:0}" : "{0:0.00}", Score.Accuracy)),
+                                                        maxCombo = new ScoreComponentLabel(FontAwesome.fa_link, Score.MaxCombo.ToString()),
+                                                        accuracy = new ScoreComponentLabel(FontAwesome.fa_crosshairs, string.Format(Score.Accuracy % 1 == 0 ? "{0:0}" : "{0:0.00}", Score.Accuracy)),
                                                     },
                                                 },
                                             },

From d96a78459d8ca4d28f379620a1682af817d80ff2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 13:55:29 +0900
Subject: [PATCH 24/94] Rename ScoreRanks to be in line with current API.

---
 .../Tests/TestCaseLeaderboard.cs               |  6 +++---
 osu.Game/Modes/ScoreRank.cs                    | 18 +++++++++++++++---
 .../Select/Leaderboards/DrawableRank.cs        |  6 +++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index 0396a2d81b..df620b218d 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -24,7 +24,7 @@ namespace osu.Desktop.VisualTests.Tests
             {
                 new Score
                 {
-                    Rank = ScoreRank.SSPlus,
+                    Rank = ScoreRank.XH,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -42,7 +42,7 @@ namespace osu.Desktop.VisualTests.Tests
                 },
                 new Score
                 {
-                    Rank = ScoreRank.SS,
+                    Rank = ScoreRank.X,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
@@ -60,7 +60,7 @@ namespace osu.Desktop.VisualTests.Tests
                 },
                 new Score
                 {
-                    Rank = ScoreRank.SPlus,
+                    Rank = ScoreRank.SH,
                     Accuracy = 100,
                     MaxCombo = 244,
                     TotalScore = 1707827,
diff --git a/osu.Game/Modes/ScoreRank.cs b/osu.Game/Modes/ScoreRank.cs
index 3e14384770..433158f249 100644
--- a/osu.Game/Modes/ScoreRank.cs
+++ b/osu.Game/Modes/ScoreRank.cs
@@ -1,17 +1,29 @@
 // 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 ScoreRank
     {
+        [Description(@"F")]
         F,
+        [Description(@"F")]
+        D,
+        [Description(@"C")]
         C,
+        [Description(@"B")]
         B,
+        [Description(@"A")]
         A,
+        [Description(@"S")]
         S,
-        SPlus,
-        SS,
-        SSPlus,
+        [Description(@"SPlus")]
+        SH,
+        [Description(@"SS")]
+        X,
+        [Description(@"SSPlus")]
+        XH,
     }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs b/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
index 048ce50de8..0d9d0cf451 100644
--- a/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Modes;
-using System;
+using osu.Framework.Extensions;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             {
                 if (value == rank) return;
                 rank = value;
-                sprite.Texture = textures.Get($@"Badges/ScoreRanks/{Enum.GetName(typeof(ScoreRank), rank)}");
+                sprite.Texture = textures.Get($@"Badges/ScoreRanks/{rank.GetDescription()}");
             }
         }
 
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         private void load(TextureStore ts)
         {
             textures = ts;
-            sprite.Texture = textures.Get($@"Badges/ScoreRanks/{Enum.GetName(typeof(ScoreRank), rank)}");
+            sprite.Texture = textures.Get($@"Badges/ScoreRanks/{rank.GetDescription()}");
         }
 
         public DrawableRank(ScoreRank rank)

From 8f5d262f300f7d9facb2b47afb6909c2c1e478aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 14:06:05 +0900
Subject: [PATCH 25/94] Add GetScoresRequest API methods.

---
 osu.Game/Modes/Score.cs                       | 39 +++++++++++++++++++
 .../Online/API/Requests/GetScoresRequest.cs   | 37 ++++++++++++++++++
 osu.Game/osu.Game.csproj                      |  1 +
 3 files changed, 77 insertions(+)
 create mode 100644 osu.Game/Online/API/Requests/GetScoresRequest.cs

diff --git a/osu.Game/Modes/Score.cs b/osu.Game/Modes/Score.cs
index f42dc7f7d4..55bbed8e77 100644
--- a/osu.Game/Modes/Score.cs
+++ b/osu.Game/Modes/Score.cs
@@ -1,6 +1,8 @@
 // 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 Newtonsoft.Json;
 using osu.Game.Users;
 using osu.Game.Database;
 using osu.Game.Modes.Mods;
@@ -9,16 +11,53 @@ namespace osu.Game.Modes
 {
     public class Score
     {
+        [JsonProperty(@"rank")]
         public ScoreRank Rank { get; set; }
+
+        [JsonProperty(@"score")]
         public double TotalScore { get; set; }
         public double Accuracy { get; set; }
         public double Health { get; set; }
+
+        [JsonProperty(@"maxcombo")]
         public int MaxCombo { get; set; }
         public int Combo { get; set; }
         public Mod[] Mods { get; set; }
 
         public User User { get; set; }
+
+        [JsonProperty(@"replay_data")]
         public Replay Replay;
+
         public BeatmapInfo Beatmap;
+
+        [JsonProperty(@"score_id")]
+        public long OnlineScoreID;
+
+        [JsonProperty(@"username")]
+        public string Username;
+
+        [JsonProperty(@"user_id")]
+        public long UserID;
+
+        [JsonProperty(@"date")]
+        public DateTime Date;
+
+        //  [JsonProperty(@"count50")] 0,
+        //[JsonProperty(@"count100")] 0,
+        //[JsonProperty(@"count300")] 100,
+        //[JsonProperty(@"countmiss")] 0,
+        //[JsonProperty(@"countkatu")] 0,
+        //[JsonProperty(@"countgeki")] 31,
+        //[JsonProperty(@"perfect")] true,
+        //[JsonProperty(@"enabled_mods")] [
+        //  "DT",
+        //  "FL",
+        //  "HD",
+        //  "HR"
+        //],
+        //[JsonProperty(@"rank")] "XH",
+        //[JsonProperty(@"pp")] 26.1816,
+        //[JsonProperty(@"replay")] true
     }
 }
diff --git a/osu.Game/Online/API/Requests/GetScoresRequest.cs b/osu.Game/Online/API/Requests/GetScoresRequest.cs
new file mode 100644
index 0000000000..4b7b3a2ce5
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetScoresRequest.cs
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Framework.IO.Network;
+using osu.Game.Database;
+using osu.Game.Modes;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetScoresRequest : APIRequest<GetScoresResponse>
+    {
+        private readonly BeatmapInfo beatmap;
+
+        public GetScoresRequest(BeatmapInfo beatmap)
+        {
+            this.beatmap = beatmap;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.AddParameter(@"c", beatmap.Hash);
+            req.AddParameter(@"f", beatmap.Path);
+            return req;
+        }
+
+        protected override string Target => @"beatmaps/scores";
+    }
+
+    public class GetScoresResponse
+    {
+        [JsonProperty(@"beatmap")]
+        public BeatmapInfo Beatmap;
+
+        [JsonProperty(@"scores")]
+        public IEnumerable<Score> Scores;
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5e807ea23d..82884263c8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -104,6 +104,7 @@
     <Compile Include="Modes\UI\StandardHealthDisplay.cs" />
     <Compile Include="Modes\UI\StandardHudOverlay.cs" />
     <Compile Include="Online\API\IOnlineComponent.cs" />
+    <Compile Include="Online\API\Requests\GetScoresRequest.cs" />
     <Compile Include="Online\API\Requests\GetUserRequest.cs" />
     <Compile Include="Overlays\DragBar.cs" />
     <Compile Include="Overlays\LoginOverlay.cs" />

From 61c45ceb08a82dd9e2096c412fa0e7f3b5a50d97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 14:06:22 +0900
Subject: [PATCH 26/94] Give Region a default value for empty ctor.

---
 osu.Game/Users/Region.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Users/Region.cs b/osu.Game/Users/Region.cs
index 99ed29ba05..2b1f9eb980 100644
--- a/osu.Game/Users/Region.cs
+++ b/osu.Game/Users/Region.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Users
             sprite.Texture = textures.Get($@"Flags/{flagName}");
         }
 
-        public DrawableFlag(string name)
+        public DrawableFlag(string name = @"__")
         {
             flagName = name;
 

From 15e713899d9da51d1d484379aeb2185968182e19 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 14:34:19 +0900
Subject: [PATCH 27/94] Add a left content area to song select.

---
 osu.Game/Screens/Select/SongSelect.cs | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ca8b353c57..ccc27e47b5 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -42,9 +42,15 @@ namespace osu.Game.Screens.Select
         private TrackManager trackManager;
         private DialogOverlay dialogOverlay;
 
-        private static readonly Vector2 wedged_container_size = new Vector2(0.5f, 225);
+
+        private static readonly Vector2 wedged_container_size = new Vector2(0.5f, 245);
+
+        private const float left_area_padding = 20;
+
         private BeatmapInfoWedge beatmapInfoWedge;
 
+        protected Container LeftContent;
+
         private static readonly Vector2 background_blur = new Vector2(20);
         private CancellationTokenSource initialAddSetsTask;
 
@@ -102,6 +108,20 @@ namespace osu.Game.Screens.Select
                     }
                 }
             });
+            Add(LeftContent = new Container
+            {
+                Origin = Anchor.BottomLeft,
+                Anchor = Anchor.BottomLeft,
+                RelativeSizeAxes = Axes.Both,
+                Size = new Vector2(wedged_container_size.X, 1),
+                Padding = new MarginPadding
+                {
+                    Bottom = 50,
+                    Top = wedged_container_size.Y + left_area_padding,
+                    Left = left_area_padding,
+                    Right = left_area_padding * 2,
+                }
+            });
             Add(carousel = new CarouselContainer
             {
                 RelativeSizeAxes = Axes.Y,
@@ -123,8 +143,8 @@ namespace osu.Game.Screens.Select
                 RelativeSizeAxes = Axes.X,
                 Margin = new MarginPadding
                 {
-                    Top = 20,
-                    Right = 20,
+                    Top = left_area_padding,
+                    Right = left_area_padding,
                 },
                 X = -50,
             });

From e3e19a156c9a88385996233eafe532536eb0faf6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 14:37:24 +0900
Subject: [PATCH 28/94] Rename incorrect class file.

---
 .../Requests/{ListChannels.cs => ListChannelsRequest.cs}    | 0
 osu.Game/osu.Game.csproj                                    | 6 ++----
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename osu.Game/Online/API/Requests/{ListChannels.cs => ListChannelsRequest.cs} (100%)

diff --git a/osu.Game/Online/API/Requests/ListChannels.cs b/osu.Game/Online/API/Requests/ListChannelsRequest.cs
similarity index 100%
rename from osu.Game/Online/API/Requests/ListChannels.cs
rename to osu.Game/Online/API/Requests/ListChannelsRequest.cs
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 82884263c8..c8227afb7d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -214,7 +214,7 @@
     <Compile Include="Online\API\OAuth.cs" />
     <Compile Include="Online\API\OAuthToken.cs" />
     <Compile Include="Online\API\Requests\GetMessagesRequest.cs" />
-    <Compile Include="Online\API\Requests\ListChannels.cs" />
+    <Compile Include="Online\API\Requests\ListChannelsRequest.cs" />
     <Compile Include="Online\Chat\Channel.cs" />
     <Compile Include="Online\Chat\Drawables\DrawableChannel.cs" />
     <Compile Include="Online\Chat\Drawables\ChatLine.cs" />
@@ -355,9 +355,7 @@
   <ItemGroup />
   <ItemGroup />
   <ItemGroup />
-  <ItemGroup>
-    <Folder Include="Screens\Select\Leaderboards\" />
-  </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.

From c1f56c7c0ee40522413cbddfe0fa740d2e819c0a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 14:38:38 +0900
Subject: [PATCH 29/94] Scores should be enumerable.

---
 .../Screens/Select/Leaderboards/Leaderboard.cs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 918be4f43a..71625e88ef 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -14,22 +14,26 @@ namespace osu.Game.Screens.Select.Leaderboards
         private ScrollContainer scrollContainer;
         private FillFlowContainer<LeaderboardScore> scrollFlow;
 
-        private Score[] scores;
-        public Score[] Scores
+        private IEnumerable<Score> scores;
+        public IEnumerable<Score> Scores
         {
             get { return scores; }
             set
             {
-                if (value == scores) return;
                 scores = value;
 
-                var scoreDisplays = new List<LeaderboardScore>();
-                for (int i = 0; i < value.Length; i++)
+                scrollFlow.Clear();
+
+                if (scores == null)
+                    return;
+
+                int i = 0;
+                foreach(var s in scores)
                 {
-                    scoreDisplays.Add(new LeaderboardScore(value[i], i + 1));
+                    scrollFlow.Add(new LeaderboardScore(s, i + 1));
+                    i++;
                 }
 
-                scrollFlow.Children = scoreDisplays;
                 scrollContainer.ScrollTo(0f, false);
             }
         }

From dfc4bccbe038246808db98d4b4b30568ac9a2a09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 14:42:51 +0900
Subject: [PATCH 30/94] Add some padding to leaderboard.

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 71625e88ef..1d378b458c 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
 using osu.Game.Modes;
 
 namespace osu.Game.Screens.Select.Leaderboards
@@ -53,6 +54,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Spacing = new Vector2(0f, 5f),
+                            Padding = new MarginPadding(5),
                         },
                     },
                 },

From 7bc0a1fdfe93b4261ccc5938777f8f64e9ab5d05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 15:21:07 +0900
Subject: [PATCH 31/94] Use fixed-width for score display.

---
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index c647709388..9ec560ba41 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -288,6 +288,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                 Origin = Anchor.Centre,
                                 Font = font,
                                 TextSize = textSize,
+                                FixedWidth = true,
                                 Text = text,
                                 Colour = glowColour,
                                 Shadow = false,
@@ -299,6 +300,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Font = font,
+                        FixedWidth = true,
                         TextSize = textSize,
                         Text = text,
                         Colour = textColour,

From 1ae4c2dfbbac5eb9a5e928eb03da7e8f5b1a018b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 15:22:28 +0900
Subject: [PATCH 32/94] Remove a lot of customisation from Avatar (and add it
 in individual usages).

---
 .../Overlays/Toolbar/ToolbarUserButton.cs     | 19 +++++++++++++++-
 .../Select/Leaderboards/LeaderboardScore.cs   | 22 ++++++-------------
 osu.Game/Users/Avatar.cs                      | 19 ++++------------
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index e8fc40825d..52c9ab5aa4 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -2,9 +2,13 @@
 // 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.Game.Online.API;
 using osu.Game.Users;
+using OpenTK;
+using OpenTK.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -20,7 +24,20 @@ namespace osu.Game.Overlays.Toolbar
 
             Add(new OpaqueBackground { Depth = 1 });
 
-            Flow.Add(avatar = new Avatar());
+            Flow.Add(avatar = new Avatar
+            {
+                Masking = true,
+                Size = new Vector2(32),
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                CornerRadius = 4,
+                EdgeEffect = new EdgeEffect
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Radius = 4,
+                    Colour = Color4.Black.Opacity(0.1f),
+                }
+            });
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 9ec560ba41..ff556ed0af 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         };
 
         private Box background;
-        private Container content, avatarContainer;
+        private Container content, avatar;
         private DrawableRank scoreRank;
         private OsuSpriteText nameLabel;
         private GlowingSpriteText scoreLabel;
@@ -63,13 +63,13 @@ namespace osu.Game.Screens.Select.Leaderboards
             // TODO: This fade to 0.01 is hacky, find a better way
             FadeTo(0.01f);
 
-            foreach (Drawable d in new Drawable[] { avatarContainer, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer, })
+            foreach (Drawable d in new Drawable[] { avatar, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer, })
             {
                 d.FadeOut();
             }
 
             content.MoveToY(75);
-            avatarContainer.MoveToX(75);
+            avatar.MoveToX(75);
             nameLabel.MoveToX(150);
 
             Delay(index * 50);
@@ -81,10 +81,10 @@ namespace osu.Game.Screens.Select.Leaderboards
                 Delay(100);
                 Schedule(() =>
                 {
-                    avatarContainer.FadeIn(300, EasingTypes.OutQuint);
+                    avatar.FadeIn(300, EasingTypes.OutQuint);
                     nameLabel.FadeIn(350, EasingTypes.OutQuint);
 
-                    avatarContainer.MoveToX(0, 300, EasingTypes.OutQuint);
+                    avatar.MoveToX(0, 300, EasingTypes.OutQuint);
                     nameLabel.MoveToX(0, 350, EasingTypes.OutQuint);
 
                     Delay(250);
@@ -165,21 +165,13 @@ namespace osu.Game.Screens.Select.Leaderboards
                             Padding = new MarginPadding(edge_margin),
                             Children = new Drawable[]
                             {
-                                avatarContainer = new Container
+                                avatar = new Avatar
                                 {
                                     Size = new Vector2(height - edge_margin * 2, height - edge_margin * 2),
                                     CornerRadius = corner_radius,
                                     Masking = true,
                                     EdgeEffect = imageShadow,
-                                    Children = new Drawable[]
-                                    {
-                                        new Avatar
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            UserId = Score.User.Id,
-                                            Masking = false,
-                                        },
-                                    },
+                                    UserId = Score.User?.Id ?? Score.UserID,
                                 },
                                 new Container
                                 {
diff --git a/osu.Game/Users/Avatar.cs b/osu.Game/Users/Avatar.cs
index 7a44d8601c..398150473d 100644
--- a/osu.Game/Users/Avatar.cs
+++ b/osu.Game/Users/Avatar.cs
@@ -21,22 +21,11 @@ namespace osu.Game.Users
         private OsuGame game;
         private Texture guestTexture;
 
-        public Avatar()
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(OsuGameBase game, TextureStore textures)
         {
-            Size = new Vector2(32);
-            Anchor = Anchor.CentreLeft;
-            Origin = Anchor.CentreLeft;
-
-            CornerRadius = Size.X / 8;
-
-            EdgeEffect = new EdgeEffect
-            {
-                Type = EdgeEffectType.Shadow,
-                Radius = 4,
-                Colour = Color4.Black.Opacity(0.1f),
-            };
-
-            Masking = true;
+            this.game = game;
+            guestTexture = textures.Get(@"Online/avatar-guest");
         }
 
         [BackgroundDependencyLoader(permitNulls: true)]

From 775a86e79841d36e2f68250b2e8caa40bd3963a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 15:22:46 +0900
Subject: [PATCH 33/94] Add null-checks and fallbacks to make display work with
 current API version.

---
 .../Screens/Select/Leaderboards/LeaderboardScore.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index ff556ed0af..b072047352 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             RelativeSizeAxes = Axes.X;
             Height = height;
 
-            var flag = Score.User.Region.CreateDrawable();
+            var flag = Score.User?.Region.CreateDrawable() ?? new DrawableFlag();
             flag.Width = 30;
             flag.RelativeSizeAxes = Axes.Y;
 
@@ -182,7 +182,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     {
                                         nameLabel = new OsuSpriteText
                                         {
-                                            Text = Score.User?.Username,
+                                            Text = Score.User?.Username ?? Score.Username,
                                             Font = @"Exo2.0-BoldItalic",
                                             TextSize = 23,
                                         },
@@ -248,10 +248,13 @@ namespace osu.Game.Screens.Select.Leaderboards
                 },
             };
 
-            foreach (Mod mod in Score.Mods)
+            if (Score.Mods != null)
             {
-                // TODO: Get actual mod colours
-                modsContainer.Add(new ScoreModIcon(mod.Icon, OsuColour.FromHex(@"ffcc22")));
+                foreach (Mod mod in Score.Mods)
+                {
+                    // TODO: Get actual mod colours
+                    modsContainer.Add(new ScoreModIcon(mod.Icon, OsuColour.FromHex(@"ffcc22")));
+                }
             }
         }
 

From 9d0c687453d8ebfab6399acccba9396ef0e495ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 17:04:50 +0900
Subject: [PATCH 34/94] Refactor avatar to handle better.

---
 osu.Game/Users/Avatar.cs | 75 ++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Users/Avatar.cs b/osu.Game/Users/Avatar.cs
index 398150473d..b0f91c0a6b 100644
--- a/osu.Game/Users/Avatar.cs
+++ b/osu.Game/Users/Avatar.cs
@@ -2,14 +2,13 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Diagnostics;
-using OpenTK;
-using OpenTK.Graphics;
+using System.Threading.Tasks;
 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.Textures;
+using osu.Framework.Logging;
 
 namespace osu.Game.Users
 {
@@ -17,8 +16,8 @@ namespace osu.Game.Users
     {
         public Drawable Sprite;
 
-        private int userId;
-        private OsuGame game;
+        private long userId;
+        private OsuGameBase game;
         private Texture guestTexture;
 
         [BackgroundDependencyLoader(permitNulls: true)]
@@ -28,15 +27,7 @@ namespace osu.Game.Users
             guestTexture = textures.Get(@"Online/avatar-guest");
         }
 
-        [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuGame game, TextureStore textures)
-        {
-            this.game = game;
-
-            guestTexture = textures.Get(@"Online/avatar-guest");
-        }
-
-        public int UserId
+        public long UserId
         {
             get { return userId; }
             set
@@ -45,29 +36,45 @@ namespace osu.Game.Users
                     return;
 
                 userId = value;
-
-                var newSprite = userId > 1 ? new OnlineSprite($@"https://a.ppy.sh/{userId}") : new Sprite { Texture = guestTexture };
-
-                newSprite.FillMode = FillMode.Fit;
-
-                if (game != null)
-                {
-                    newSprite.LoadAsync(game, s =>
-                    {
-                        Sprite?.FadeOut();
-                        Sprite?.Expire();
-                        Sprite = s;
-
-                        Add(s);
-
-                            //todo: fix this... clock dependencies are a pain
-                            if (s.Clock != null)
-                            s.FadeInFromZero(200);
-                    });
-                }
+                invalidateSprite();
             }
         }
 
+        private Task loadTask;
+
+        private void invalidateSprite()
+        {
+            Sprite?.FadeOut(100);
+            Sprite?.Expire();
+            Sprite = null;
+        }
+
+        private void updateSprite()
+        {
+            if (loadTask != null || Sprite != null) return;
+
+            var newSprite = userId > 1 ? new OnlineSprite($@"https://a.ppy.sh/{userId}") : new Sprite { Texture = guestTexture };
+
+            newSprite.FillMode = FillMode.Fill;
+
+            loadTask = newSprite.LoadAsync(game, s =>
+            {
+                Sprite = s;
+                Add(Sprite);
+
+                Sprite.FadeInFromZero(200);
+                loadTask = null;
+            });
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            //todo: should only be run when we are visible to the user.
+            updateSprite();
+        }
+
         public class OnlineSprite : Sprite
         {
             private readonly string url;

From 78efecb89dee8107f2e996d1c532e8165f5247e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 17:07:56 +0900
Subject: [PATCH 35/94] Remove Alpha 0.001 hack.

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs      | 6 ++++--
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 1d378b458c..ec6258fdaf 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -31,8 +31,10 @@ namespace osu.Game.Screens.Select.Leaderboards
                 int i = 0;
                 foreach(var s in scores)
                 {
-                    scrollFlow.Add(new LeaderboardScore(s, i + 1));
-                    i++;
+                    scrollFlow.Add(new LeaderboardScore(s, 1 + i++)
+                    {
+                        AlwaysPresent = true
+                    });
                 }
 
                 scrollContainer.ScrollTo(0f, false);
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index b072047352..743ffa9997 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -60,14 +60,13 @@ namespace osu.Game.Screens.Select.Leaderboards
         {
             base.LoadComplete();
 
-            // TODO: This fade to 0.01 is hacky, find a better way
-            FadeTo(0.01f);
-
             foreach (Drawable d in new Drawable[] { avatar, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer, })
             {
                 d.FadeOut();
             }
 
+            Alpha = 0;
+
             content.MoveToY(75);
             avatar.MoveToX(75);
             nameLabel.MoveToX(150);

From 4f95378f279f2e9bc0ce75045a3bdc1f707ca064 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 17:10:54 +0900
Subject: [PATCH 36/94] Add fade out of previously displayed scores.

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index ec6258fdaf..66761fad35 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -23,12 +23,17 @@ namespace osu.Game.Screens.Select.Leaderboards
             {
                 scores = value;
 
+                int i = 0;
+                if (scores == null)
+                {
+                    foreach (var c in scrollFlow.Children)
+                        c.FadeOut(150 + i++ * 10);
+                    return;
+                }
+
                 scrollFlow.Clear();
 
-                if (scores == null)
-                    return;
-
-                int i = 0;
+                i = 0;
                 foreach(var s in scores)
                 {
                     scrollFlow.Add(new LeaderboardScore(s, 1 + i++)

From 295f8210253d8663cad9df30bc3e0bde88955a61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 17:11:08 +0900
Subject: [PATCH 37/94] Add leaderboard to song select.

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 53f3a3a596..97e64f44e2 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -8,9 +8,11 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Mods;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Select.Leaderboards;
 
 namespace osu.Game.Screens.Select
 {
@@ -18,6 +20,7 @@ namespace osu.Game.Screens.Select
     {
         private OsuScreen player;
         private ModSelectOverlay modSelect;
+        private Leaderboard leaderboard;
 
         public PlaySongSelect()
         {
@@ -28,6 +31,11 @@ namespace osu.Game.Screens.Select
                 Anchor = Anchor.BottomCentre,
                 Margin = new MarginPadding { Bottom = 50 }
             });
+
+            LeftContent.Add(leaderboard = new Leaderboard
+            {
+                RelativeSizeAxes = Axes.Both,
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -47,6 +55,18 @@ namespace osu.Game.Screens.Select
         protected override void OnBeatmapChanged(WorkingBeatmap beatmap)
         {
             beatmap?.Mods.BindTo(modSelect.SelectedMods);
+
+            leaderboard.Scores = null;
+            if (beatmap != null)
+            {
+                var getScores = new GetScoresRequest(beatmap.BeatmapInfo);
+                getScores.Success += res =>
+                {
+                    leaderboard.Scores = res.Scores;
+                };
+                Game.API.Queue(getScores);
+            }
+
             base.OnBeatmapChanged(beatmap);
         }
 

From 08e93275fa8cc8a3bd620ade9f3073523490cdd1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 17:50:52 +0900
Subject: [PATCH 38/94] Styling fixes.

---
 osu.Game/Online/API/Requests/GetScoresRequest.cs | 5 ++++-
 osu.Game/Users/Avatar.cs                         | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetScoresRequest.cs b/osu.Game/Online/API/Requests/GetScoresRequest.cs
index 4b7b3a2ce5..8c0fc4383a 100644
--- a/osu.Game/Online/API/Requests/GetScoresRequest.cs
+++ b/osu.Game/Online/API/Requests/GetScoresRequest.cs
@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+// 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 Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Game.Database;
diff --git a/osu.Game/Users/Avatar.cs b/osu.Game/Users/Avatar.cs
index b0f91c0a6b..2d88baa804 100644
--- a/osu.Game/Users/Avatar.cs
+++ b/osu.Game/Users/Avatar.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Logging;
 
 namespace osu.Game.Users
 {

From 1855f48997aad66735b6a90c94ddf49fc8e2d0c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 18:07:26 +0900
Subject: [PATCH 39/94] Add cancellation support for API requests.

---
 osu.Game/Online/API/APIRequest.cs         | 11 ++++++++++-
 osu.Game/Screens/Select/PlaySongSelect.cs | 10 +++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index f871e5e20a..43c039eb1e 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -58,8 +58,12 @@ namespace osu.Game.Online.API
         public event APISuccessHandler Success;
         public event APIFailureHandler Failure;
 
+        private bool cancelled;
+
         public void Perform(APIAccess api)
         {
+            if (cancelled) return;
+
             if (startTime == null)
                 startTime = DateTime.Now.TotalMilliseconds();
 
@@ -74,11 +78,16 @@ namespace osu.Game.Online.API
 
             WebRequest.BlockingPerform();
 
-            api.Scheduler.Add(delegate { Success?.Invoke(); });
+            if (WebRequest.Completed)
+                api.Scheduler.Add(delegate { Success?.Invoke(); });
         }
 
+        public void Cancel() => Fail(new OperationCanceledException(@"Request cancelled"));
+
         public void Fail(Exception e)
         {
+            cancelled = true;
+
             WebRequest?.Abort();
             api.Scheduler.Add(delegate
             {
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 97e64f44e2..841f8eda7f 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -52,19 +52,23 @@ namespace osu.Game.Screens.Select
             }, Key.Number3);
         }
 
+        private GetScoresRequest getScoresRequest;
+
         protected override void OnBeatmapChanged(WorkingBeatmap beatmap)
         {
             beatmap?.Mods.BindTo(modSelect.SelectedMods);
 
             leaderboard.Scores = null;
+            getScoresRequest?.Cancel();
+
             if (beatmap != null)
             {
-                var getScores = new GetScoresRequest(beatmap.BeatmapInfo);
-                getScores.Success += res =>
+                getScoresRequest = new GetScoresRequest(beatmap.BeatmapInfo);
+                getScoresRequest.Success += res =>
                 {
                     leaderboard.Scores = res.Scores;
                 };
-                Game.API.Queue(getScores);
+                Game.API.Queue(getScoresRequest);
             }
 
             base.OnBeatmapChanged(beatmap);

From d208614495ae4dab62e1417cf17fb413ce1d24c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 19:07:26 +0900
Subject: [PATCH 40/94] Add local off-screen avatar optimisation.

---
 osu.Game/Users/Avatar.cs | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Users/Avatar.cs b/osu.Game/Users/Avatar.cs
index 2d88baa804..efdd09d5bc 100644
--- a/osu.Game/Users/Avatar.cs
+++ b/osu.Game/Users/Avatar.cs
@@ -66,12 +66,30 @@ namespace osu.Game.Users
             });
         }
 
+        private double timeVisible;
+
+        private bool shouldUpdate => Sprite != null || timeVisible > 500;
+
         protected override void Update()
         {
             base.Update();
 
-            //todo: should only be run when we are visible to the user.
-            updateSprite();
+            if (!shouldUpdate)
+            {
+                //Special optimisation to not start loading until we are within bounds of our closest ScrollContainer parent.
+                ScrollContainer scroll = null;
+                IContainer cursor = this;
+                while (scroll == null && (cursor = cursor.Parent) != null)
+                    scroll = cursor as ScrollContainer;
+
+                if (scroll?.ScreenSpaceDrawQuad.Intersects(ScreenSpaceDrawQuad) ?? true)
+                    timeVisible += Time.Elapsed;
+                else
+                    timeVisible = 0;
+            }
+
+            if (shouldUpdate)
+                updateSprite();
         }
 
         public class OnlineSprite : Sprite

From f2cfcdb2cad49c88d21d4914d8e27ebdd7cc6f96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 19:09:30 +0900
Subject: [PATCH 41/94] Force an OnBeatmapChanged event to invoke when entering
 a screen.

---
 osu.Game/Screens/OsuGameScreen.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OsuGameScreen.cs b/osu.Game/Screens/OsuGameScreen.cs
index 871d3a6780..846027f0cf 100644
--- a/osu.Game/Screens/OsuGameScreen.cs
+++ b/osu.Game/Screens/OsuGameScreen.cs
@@ -69,6 +69,8 @@ namespace osu.Game.Screens
 
             BackgroundScreen bg = CreateBackground();
 
+            OnBeatmapChanged(Beatmap);
+
             if (lastOsu?.Background != null)
             {
                 if (bg == null || lastOsu.Background.Equals(bg))

From 56868e3c0651f4dfc6c9dfc21ff72735917d48f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 19:21:55 +0900
Subject: [PATCH 42/94] Make a few more strings literals.

---
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 743ffa9997..12a2545ad6 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                     Children = new Drawable[]
                                                     {
                                                         maxCombo = new ScoreComponentLabel(FontAwesome.fa_link, Score.MaxCombo.ToString()),
-                                                        accuracy = new ScoreComponentLabel(FontAwesome.fa_crosshairs, string.Format(Score.Accuracy % 1 == 0 ? "{0:0}" : "{0:0.00}", Score.Accuracy)),
+                                                        accuracy = new ScoreComponentLabel(FontAwesome.fa_crosshairs, string.Format(Score.Accuracy % 1 == 0 ? @"{0:0}" : @"{0:0.00}", Score.Accuracy)),
                                                     },
                                                 },
                                             },
@@ -226,7 +226,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     Size = new Vector2(score_rank_size),
                                     Position = new Vector2(0f, -10f),
                                 },
-                                scoreLabel = new GlowingSpriteText(Score.TotalScore.ToString("N0"), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
+                                scoreLabel = new GlowingSpriteText(Score.TotalScore.ToString(@"N0"), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
                                 {
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,

From 2b82f256d2807279066e9972406f00a230a54810 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Mar 2017 20:08:12 +0900
Subject: [PATCH 43/94] More resilient API cancel/fail logic.

---
 osu.Game/Online/API/APIRequest.cs | 41 +++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 43c039eb1e..23268a9ca9 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -60,15 +60,18 @@ namespace osu.Game.Online.API
 
         private bool cancelled;
 
+        private Action pendingFailure;
+
         public void Perform(APIAccess api)
         {
-            if (cancelled) return;
+            this.api = api;
+
+            if (checkAndProcessFailure())
+                return;
 
             if (startTime == null)
                 startTime = DateTime.Now.TotalMilliseconds();
 
-            this.api = api;
-
             if (remainingTime <= 0)
                 throw new TimeoutException(@"API request timeout hit");
 
@@ -76,10 +79,16 @@ namespace osu.Game.Online.API
             WebRequest.RetryCount = 0;
             WebRequest.Headers[@"Authorization"] = $@"Bearer {api.AccessToken}";
 
-            WebRequest.BlockingPerform();
+            if (checkAndProcessFailure())
+                return;
 
-            if (WebRequest.Completed)
-                api.Scheduler.Add(delegate { Success?.Invoke(); });
+            if (!WebRequest.Aborted) //could have been aborted by a Cancel() call
+                WebRequest.BlockingPerform();
+
+            if (checkAndProcessFailure())
+                return;
+
+            api.Scheduler.Add(delegate { Success?.Invoke(); });
         }
 
         public void Cancel() => Fail(new OperationCanceledException(@"Request cancelled"));
@@ -89,10 +98,22 @@ namespace osu.Game.Online.API
             cancelled = true;
 
             WebRequest?.Abort();
-            api.Scheduler.Add(delegate
-            {
-                Failure?.Invoke(e);
-            });
+
+            pendingFailure = () => Failure?.Invoke(e);
+            checkAndProcessFailure();
+        }
+
+        /// <summary>
+        /// Checked for cancellation or error. Also queues up the Failed event if we can.
+        /// </summary>
+        /// <returns>Whether we are in a failed or cancelled state.</returns>
+        private bool checkAndProcessFailure()
+        {
+            if (api == null || pendingFailure == null) return cancelled;
+
+            api.Scheduler.Add(pendingFailure);
+            pendingFailure = null;
+            return true;
         }
     }
 

From 7572947214597168e8089f650115294a60e76319 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Wed, 15 Mar 2017 08:09:44 -0300
Subject: [PATCH 44/94] Badge -> Team

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs      | 3 +++
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 1 +
 osu.Game/Users/{Badge.cs => Team.cs}                     | 6 +++---
 osu.Game/Users/User.cs                                   | 2 +-
 osu.Game/osu.Game.csproj                                 | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename osu.Game/Users/{Badge.cs => Team.cs} (70%)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 66761fad35..2335891229 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -3,7 +3,10 @@
 
 using System.Collections.Generic;
 using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Modes;
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 12a2545ad6..260a9fd54c 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics.Colour;
 using osu.Game.Modes.Mods;
 using osu.Game.Users;
 
diff --git a/osu.Game/Users/Badge.cs b/osu.Game/Users/Team.cs
similarity index 70%
rename from osu.Game/Users/Badge.cs
rename to osu.Game/Users/Team.cs
index 341d3fab1d..ae89aef293 100644
--- a/osu.Game/Users/Badge.cs
+++ b/osu.Game/Users/Team.cs
@@ -7,16 +7,16 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Users
 {
-    public class Badge : IHasDrawableRepresentation<Sprite>
+    public class Team : IHasDrawableRepresentation<Sprite>
     {
         public string Name;
-        public Texture Texture; // TODO: Replace this with something better
+        public Texture Flag; // TODO: Replace this with something better
 
         public Sprite CreateDrawable()
         {
             return new Sprite
             {
-                Texture = Texture,
+                Texture = Flag,
             };
         }
     }
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index d6da17483c..30126e39b8 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -10,6 +10,6 @@ namespace osu.Game.Users
         public int Id;
         public string Username;
         public Region Region;
-        public IEnumerable<Badge> Badges;
+        public Team Team;
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c8227afb7d..4b1f19c7cf 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -330,7 +330,7 @@
     <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
     <Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
     <Compile Include="Users\Region.cs" />
-    <Compile Include="Users\Badge.cs" />
+    <Compile Include="Users\Team.cs" />
     <Compile Include="Modes\ScoreRank.cs" />
     <Compile Include="Users\Avatar.cs" />
     <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />

From aea9a7b79551496846ad1e14d05b1a90e1381be4 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Wed, 15 Mar 2017 08:44:29 -0300
Subject: [PATCH 45/94] LeaderboardScore state, initial delay handled by
 leaderboard

---
 .../Select/Leaderboards/Leaderboard.cs        |  15 ++-
 .../Select/Leaderboards/LeaderboardScore.cs   | 119 ++++++++++--------
 2 files changed, 76 insertions(+), 58 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 2335891229..6d71934b81 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -3,10 +3,7 @@
 
 using System.Collections.Generic;
 using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Modes;
@@ -39,9 +36,17 @@ namespace osu.Game.Screens.Select.Leaderboards
                 i = 0;
                 foreach(var s in scores)
                 {
-                    scrollFlow.Add(new LeaderboardScore(s, 1 + i++)
+                    var ls = new LeaderboardScore(s, 1 + i++)
                     {
-                        AlwaysPresent = true
+                        AlwaysPresent = true,
+                        State = Visibility.Hidden,
+                    };
+                    scrollFlow.Add(ls);
+
+                    ls.Delay(i * 50);
+                    ls.Schedule(() =>
+                    {
+                        ls.Show();
                     });
                 }
 
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 260a9fd54c..f4ee6f9d35 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -12,13 +12,13 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Modes;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics.Colour;
 using osu.Game.Modes.Mods;
 using osu.Game.Users;
+using osu.Framework;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
-    public class LeaderboardScore : Container
+    public class LeaderboardScore : Container, IStateful<Visibility>
     {
         private const float height = 70;
         private const float corner_radius = 5;
@@ -45,6 +45,70 @@ namespace osu.Game.Screens.Select.Leaderboards
         private readonly int index;
         public readonly Score Score;
 
+        private Visibility state;
+        public Visibility State
+        {
+            get { return state; }
+            set
+            {
+                state = value;
+
+                switch (state)
+                {
+                    case Visibility.Hidden:
+                        foreach (Drawable d in new Drawable[] { avatar, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer, })
+                        {
+                            d.FadeOut();
+                        }
+
+                        Alpha = 0;
+
+                        content.MoveToY(75);
+                        avatar.MoveToX(75);
+                        nameLabel.MoveToX(150);
+                        break;
+
+                    case Visibility.Visible:
+                        FadeIn(200);
+                        content.MoveToY(0, 800, EasingTypes.OutQuint);
+
+                        Delay(100);
+                        Schedule(() =>
+                        {
+                            avatar.FadeIn(300, EasingTypes.OutQuint);
+                            nameLabel.FadeIn(350, EasingTypes.OutQuint);
+
+                            avatar.MoveToX(0, 300, EasingTypes.OutQuint);
+                            nameLabel.MoveToX(0, 350, EasingTypes.OutQuint);
+
+                            Delay(250);
+                            Schedule(() =>
+                            {
+                                scoreLabel.FadeIn(200);
+                                scoreRank.FadeIn(200);
+
+                                Delay(50);
+                                Schedule(() =>
+                                {
+                                    var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, };
+
+                                    for (int i = 0; i < drawables.Length; i++)
+                                    {
+                                        drawables[i].FadeIn(100 + i * 50);
+                                    }
+                                });
+                            });
+                        });
+
+                        break;
+                }
+            }
+        }
+
+        public override void Hide() => State = Visibility.Hidden;
+        public override void Show() => State = Visibility.Visible;
+        public void ToggleVisibility() => State = State == Visibility.Visible ? Visibility.Hidden : Visibility.Visible;
+
         protected override bool OnHover(Framework.Input.InputState state)
         {
             background.FadeTo(0.5f, 300, EasingTypes.OutQuint);
@@ -57,57 +121,6 @@ namespace osu.Game.Screens.Select.Leaderboards
             base.OnHoverLost(state);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            foreach (Drawable d in new Drawable[] { avatar, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer, })
-            {
-                d.FadeOut();
-            }
-
-            Alpha = 0;
-
-            content.MoveToY(75);
-            avatar.MoveToX(75);
-            nameLabel.MoveToX(150);
-
-            Delay(index * 50);
-            Schedule(() =>
-            {
-                FadeIn(200);
-                content.MoveToY(0, 800, EasingTypes.OutQuint);
-
-                Delay(100);
-                Schedule(() =>
-                {
-                    avatar.FadeIn(300, EasingTypes.OutQuint);
-                    nameLabel.FadeIn(350, EasingTypes.OutQuint);
-
-                    avatar.MoveToX(0, 300, EasingTypes.OutQuint);
-                    nameLabel.MoveToX(0, 350, EasingTypes.OutQuint);
-
-                    Delay(250);
-                    Schedule(() =>
-                    {
-                        scoreLabel.FadeIn(200);
-                        scoreRank.FadeIn(200);
-
-                        Delay(50);
-                        Schedule(() =>
-                        {
-                            var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, };
-
-                            for (int i = 0; i < drawables.Length; i++)
-                            {
-                                drawables[i].FadeIn(100 + i * 50);
-                            }
-                        });
-                    });
-                });
-            });
-        }
-
         public LeaderboardScore(Score score, int i)
         {
             Score = score;

From 847d485d5f42a1e02548961fa0c7bd93ca01942b Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Wed, 15 Mar 2017 08:49:17 -0300
Subject: [PATCH 46/94] Remove schedules

---
 .../Select/Leaderboards/Leaderboard.cs        |  7 +--
 .../Select/Leaderboards/LeaderboardScore.cs   | 43 ++++++++-----------
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 6d71934b81..533fb1229b 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -43,11 +43,8 @@ namespace osu.Game.Screens.Select.Leaderboards
                     };
                     scrollFlow.Add(ls);
 
-                    ls.Delay(i * 50);
-                    ls.Schedule(() =>
-                    {
-                        ls.Show();
-                    });
+                    ls.Delay(i * 50, true);
+                    ls.Show();
                 }
 
                 scrollContainer.ScrollTo(0f, false);
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index f4ee6f9d35..d02569247f 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -72,33 +72,24 @@ namespace osu.Game.Screens.Select.Leaderboards
                         FadeIn(200);
                         content.MoveToY(0, 800, EasingTypes.OutQuint);
 
-                        Delay(100);
-                        Schedule(() =>
+                        Delay(100, true);
+                        avatar.FadeIn(300, EasingTypes.OutQuint);
+                        nameLabel.FadeIn(350, EasingTypes.OutQuint);
+
+                        avatar.MoveToX(0, 300, EasingTypes.OutQuint);
+                        nameLabel.MoveToX(0, 350, EasingTypes.OutQuint);
+
+                        Delay(250, true);
+                        scoreLabel.FadeIn(200);
+                        scoreRank.FadeIn(200);
+
+                        Delay(50, true);
+                        var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, };
+
+                        for (int i = 0; i < drawables.Length; i++)
                         {
-                            avatar.FadeIn(300, EasingTypes.OutQuint);
-                            nameLabel.FadeIn(350, EasingTypes.OutQuint);
-
-                            avatar.MoveToX(0, 300, EasingTypes.OutQuint);
-                            nameLabel.MoveToX(0, 350, EasingTypes.OutQuint);
-
-                            Delay(250);
-                            Schedule(() =>
-                            {
-                                scoreLabel.FadeIn(200);
-                                scoreRank.FadeIn(200);
-
-                                Delay(50);
-                                Schedule(() =>
-                                {
-                                    var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, };
-
-                                    for (int i = 0; i < drawables.Length; i++)
-                                    {
-                                        drawables[i].FadeIn(100 + i * 50);
-                                    }
-                                });
-                            });
-                        });
+                            drawables[i].FadeIn(100 + i * 50);
+                        }
 
                         break;
                 }

From 20685d51cdf8fe2aa16d2e8299b55ea013e2d116 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Wed, 15 Mar 2017 08:51:07 -0300
Subject: [PATCH 47/94] Adjust delays to start at 0

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 533fb1229b..66327c0cbc 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                     };
                     scrollFlow.Add(ls);
 
-                    ls.Delay(i * 50, true);
+                    ls.Delay((i - 1) * 50, true);
                     ls.Show();
                 }
 

From efd617dd34e905ae66667dd703be664599ba4286 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Wed, 15 Mar 2017 08:53:36 -0300
Subject: [PATCH 48/94] Formatting

---
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 6 +++---
 osu.Game/Users/User.cs                                   | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index d02569247f..1c745ff7cb 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         private Container flagBadgeContainer;
         private FillFlowContainer<ScoreModIcon> modsContainer;
 
-        private readonly int index;
+        public readonly int Index;
         public readonly Score Score;
 
         private Visibility state;
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         public LeaderboardScore(Score score, int i)
         {
             Score = score;
-            index = i;
+            Index = i;
 
             RelativeSizeAxes = Axes.X;
             Height = height;
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                             Origin = Anchor.CentreLeft,
                             Font = @"Exo2.0-MediumItalic",
                             TextSize = 22,
-                            Text = index.ToString(),
+                            Text = Index.ToString(),
                         },
                     },
                 },
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 30126e39b8..d3e1f730cc 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.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 System.Collections.Generic;
-
 namespace osu.Game.Users
 {
     public class User

From cd37ebdff239623d21c8637259e4c467feec23c6 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Wed, 15 Mar 2017 13:57:41 -0300
Subject: [PATCH 49/94] Fading

---
 .../Select/Leaderboards/Leaderboard.cs        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 66327c0cbc..16e811f868 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -3,7 +3,10 @@
 
 using System.Collections.Generic;
 using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Modes;
@@ -51,6 +54,22 @@ namespace osu.Game.Screens.Select.Leaderboards
             }
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            foreach (var s in scrollFlow.Children)
+            {
+                var topY = scrollContainer.ScrollContent.DrawPosition.Y + s.DrawPosition.Y;
+                var bottomY = topY + 70;
+                var fadeStart = scrollContainer.DrawHeight - 10;
+                fadeStart += scrollContainer.IsScrolledToEnd() ? 70 : 0;
+
+                s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / 70, 1)),
+                                                           Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / 70, 1)));
+            }
+        }
+
         public Leaderboard()
         {
             Children = new Drawable[]

From cf81467e1361f17e5c4db842ba1f09c5c6894a95 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Wed, 15 Mar 2017 14:00:31 -0300
Subject: [PATCH 50/94] Move fade start out of loop

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 16e811f868..3efd7f4099 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -58,12 +58,13 @@ namespace osu.Game.Screens.Select.Leaderboards
         {
             base.Update();
 
+            var fadeStart = scrollContainer.DrawHeight - 10;
+            fadeStart += scrollContainer.IsScrolledToEnd() ? 70 : 0;
+
             foreach (var s in scrollFlow.Children)
             {
                 var topY = scrollContainer.ScrollContent.DrawPosition.Y + s.DrawPosition.Y;
                 var bottomY = topY + 70;
-                var fadeStart = scrollContainer.DrawHeight - 10;
-                fadeStart += scrollContainer.IsScrolledToEnd() ? 70 : 0;
 
                 s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / 70, 1)),
                                                            Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / 70, 1)));

From 8e5d83b85799a21ee66d9389c871ac358c27b973 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Mar 2017 12:34:21 +0900
Subject: [PATCH 51/94] Isolate leaderboard retrieval code into its own method.

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 841f8eda7f..c5c8543e6b 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -58,20 +58,21 @@ namespace osu.Game.Screens.Select
         {
             beatmap?.Mods.BindTo(modSelect.SelectedMods);
 
+            updateLeaderboard(beatmap);
+
+            base.OnBeatmapChanged(beatmap);
+        }
+
+        private void updateLeaderboard(WorkingBeatmap beatmap)
+        {
             leaderboard.Scores = null;
             getScoresRequest?.Cancel();
 
-            if (beatmap != null)
-            {
-                getScoresRequest = new GetScoresRequest(beatmap.BeatmapInfo);
-                getScoresRequest.Success += res =>
-                {
-                    leaderboard.Scores = res.Scores;
-                };
-                Game.API.Queue(getScoresRequest);
-            }
+            if (beatmap?.BeatmapInfo == null) return;
 
-            base.OnBeatmapChanged(beatmap);
+            getScoresRequest = new GetScoresRequest(beatmap.BeatmapInfo);
+            getScoresRequest.Success += r => leaderboard.Scores = r.Scores;
+            Game.API.Queue(getScoresRequest);
         }
 
         protected override void OnResuming(Screen last)

From ff37d2da038043d7ecc68286c7f655bc057e373e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Mar 2017 13:15:06 +0900
Subject: [PATCH 52/94] Index -> Rank + some formatting.

---
 .../Select/Leaderboards/Leaderboard.cs        | 40 +++++++++----------
 .../Select/Leaderboards/LeaderboardScore.cs   | 14 ++++---
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 3efd7f4099..b94f9df70c 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -37,16 +37,16 @@ namespace osu.Game.Screens.Select.Leaderboards
                 scrollFlow.Clear();
 
                 i = 0;
-                foreach(var s in scores)
+                foreach (var s in scores)
                 {
-                    var ls = new LeaderboardScore(s, 1 + i++)
+                    var ls = new LeaderboardScore(s, 1 + i)
                     {
                         AlwaysPresent = true,
                         State = Visibility.Hidden,
                     };
                     scrollFlow.Add(ls);
 
-                    ls.Delay((i - 1) * 50, true);
+                    ls.Delay(i++ * 50, true);
                     ls.Show();
                 }
 
@@ -54,23 +54,6 @@ namespace osu.Game.Screens.Select.Leaderboards
             }
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            var fadeStart = scrollContainer.DrawHeight - 10;
-            fadeStart += scrollContainer.IsScrolledToEnd() ? 70 : 0;
-
-            foreach (var s in scrollFlow.Children)
-            {
-                var topY = scrollContainer.ScrollContent.DrawPosition.Y + s.DrawPosition.Y;
-                var bottomY = topY + 70;
-
-                s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / 70, 1)),
-                                                           Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / 70, 1)));
-            }
-        }
-
         public Leaderboard()
         {
             Children = new Drawable[]
@@ -92,5 +75,22 @@ namespace osu.Game.Screens.Select.Leaderboards
                 },
             };
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            var fadeStart = scrollContainer.DrawHeight - 10;
+            fadeStart += scrollContainer.IsScrolledToEnd() ? 70 : 0;
+
+            foreach (var s in scrollFlow.Children)
+            {
+                var topY = scrollContainer.ScrollContent.DrawPosition.Y + s.DrawPosition.Y;
+                var bottomY = topY + 70;
+
+                s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / 70, 1)),
+                                                           Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / 70, 1)));
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 1c745ff7cb..0a5b29058d 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         private Container flagBadgeContainer;
         private FillFlowContainer<ScoreModIcon> modsContainer;
 
-        public readonly int Index;
+        public readonly int Rank;
         public readonly Score Score;
 
         private Visibility state;
@@ -112,10 +112,10 @@ namespace osu.Game.Screens.Select.Leaderboards
             base.OnHoverLost(state);
         }
 
-        public LeaderboardScore(Score score, int i)
+        public LeaderboardScore(Score score, int rank)
         {
             Score = score;
-            Index = i;
+            Rank = rank;
 
             RelativeSizeAxes = Axes.X;
             Height = height;
@@ -124,12 +124,14 @@ namespace osu.Game.Screens.Select.Leaderboards
             flag.Width = 30;
             flag.RelativeSizeAxes = Axes.Y;
 
+            const float rank_width = 30;
+
             Children = new Drawable[]
             {
                 new Container
                 {
                     RelativeSizeAxes = Axes.Y,
-                    Width = 40,
+                    Width = rank_width,
                     Children = new[]
                     {
                         new OsuSpriteText
@@ -138,14 +140,14 @@ namespace osu.Game.Screens.Select.Leaderboards
                             Origin = Anchor.CentreLeft,
                             Font = @"Exo2.0-MediumItalic",
                             TextSize = 22,
-                            Text = Index.ToString(),
+                            Text = Rank.ToString(),
                         },
                     },
                 },
                 content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = 40, },
+                    Padding = new MarginPadding { Left = rank_width, },
                     Children = new Drawable[]
                     {
                         new Container

From 8568e1536ca2f46f3455f943406981fcf204d229 Mon Sep 17 00:00:00 2001
From: Jorolf <jorolf@gmx.de>
Date: Fri, 17 Mar 2017 18:40:03 +0100
Subject: [PATCH 53/94] Separated menu and gameplay cursor size

---
 osu.Game/Configuration/OsuConfigManager.cs        | 2 ++
 osu.Game/Graphics/Cursor/GameplayCursor.cs        | 2 +-
 osu.Game/Overlays/Options/Sections/SkinSection.cs | 7 ++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 70bfbb5992..f7d5e69fd3 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Configuration
             Set(OsuConfig.SaveUsername, true);
 
             Set(OsuConfig.CursorSize, 1.0, 0.5f, 2);
+            Set(OsuConfig.GameplayCursorSize, 1.0, 0.5f, 2);
             Set(OsuConfig.DimLevel, 30, 0, 100);
 
             Set(OsuConfig.MouseDisableButtons, false);
@@ -224,6 +225,7 @@ namespace osu.Game.Configuration
         ConfirmExit,
         AutoSendNowPlaying,
         CursorSize,
+        GameplayCursorSize,
         AutomaticCursorSizing,
         DimLevel,
         Display,
diff --git a/osu.Game/Graphics/Cursor/GameplayCursor.cs b/osu.Game/Graphics/Cursor/GameplayCursor.cs
index a544a8e1bb..42d7e83750 100644
--- a/osu.Game/Graphics/Cursor/GameplayCursor.cs
+++ b/osu.Game/Graphics/Cursor/GameplayCursor.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Graphics.Cursor
             [BackgroundDependencyLoader]
             private void load(OsuConfigManager config)
             {
-                cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
+                cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
 
                 Children = new Drawable[]
                 {
diff --git a/osu.Game/Overlays/Options/Sections/SkinSection.cs b/osu.Game/Overlays/Options/Sections/SkinSection.cs
index 56dd9ca318..c9c1e723f0 100644
--- a/osu.Game/Overlays/Options/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Options/Sections/SkinSection.cs
@@ -61,9 +61,14 @@ namespace osu.Game.Overlays.Options.Sections
                 },
                 new OptionSlider<double>
                 {
-                    LabelText = "Cursor size",
+                    LabelText = "Menu Cursor size",
                     Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.CursorSize)
                 },
+                new OptionSlider<double>
+                {
+                    LabelText = "Gameplay Cursor size",
+                    Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.GameplayCursorSize)
+                },
                 new OsuCheckbox
                 {
                     LabelText = "Automatic cursor size",

From 0834b5b7943aa06fb09f6fffb15b9e0cd5b5b2b7 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Fri, 17 Mar 2017 18:16:59 -0300
Subject: [PATCH 54/94] Made requested changes

---
 .../Tests/TestCaseDrawings.cs                 | 20 ++++----
 .../Tests/TestCaseLeaderboard.cs              | 20 ++++----
 .../Select/Leaderboards/LeaderboardScore.cs   | 46 +++++++++++++------
 osu.Game/Screens/Tournament/Drawings.cs       | 14 +++---
 osu.Game/Screens/Tournament/Group.cs          |  8 ++--
 osu.Game/Screens/Tournament/GroupContainer.cs |  2 +-
 .../Tournament/ScrollingTeamContainer.cs      | 20 ++++----
 .../Screens/Tournament/Teams/ITeamList.cs     |  2 +-
 .../Tournament/Teams/StorageBackedTeamList.cs |  6 +--
 osu.Game/Users/{Region.cs => Country.cs}      |  4 +-
 osu.Game/Users/Team.cs                        |  6 +--
 osu.Game/Users/User.cs                        |  2 +-
 osu.Game/osu.Game.csproj                      |  2 +-
 13 files changed, 82 insertions(+), 70 deletions(-)
 rename osu.Game/Users/{Region.cs => Country.cs} (91%)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs b/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs
index 0e99431a04..00e41de254 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs
@@ -25,57 +25,57 @@ namespace osu.Desktop.VisualTests.Tests
 
         private class TestTeamList : ITeamList
         {
-            public IEnumerable<Region> Teams { get; } = new[]
+            public IEnumerable<Country> Teams { get; } = new[]
             {
-                new Region
+                new Country
                 {
                     FlagName = "GB",
                     FullName = "United Kingdom",
                     Acronym = "UK"
                 },
-                new Region
+                new Country
                 {
                     FlagName = "FR",
                     FullName = "France",
                     Acronym = "FRA"
                 },
-                new Region
+                new Country
                 {
                     FlagName = "CN",
                     FullName = "China",
                     Acronym = "CHN"
                 },
-                new Region
+                new Country
                 {
                     FlagName = "AU",
                     FullName = "Australia",
                     Acronym = "AUS"
                 },
-                new Region
+                new Country
                 {
                     FlagName = "JP",
                     FullName = "Japan",
                     Acronym = "JPN"
                 },
-                new Region
+                new Country
                 {
                     FlagName = "RO",
                     FullName = "Romania",
                     Acronym = "ROM"
                 },
-                new Region
+                new Country
                 {
                     FlagName = "IT",
                     FullName = "Italy",
                     Acronym = "PIZZA"
                 },
-                new Region
+                new Country
                 {
                     FlagName = "VE",
                     FullName = "Venezuela",
                     Acronym = "VNZ"
                 },
-                new Region
+                new Country
                 {
                     FlagName = "US",
                     FullName = "United States of America",
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index df620b218d..aa53d773a0 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -33,7 +33,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 6602580,
                         Username = @"waaiiru",
-                        Region = new Region
+                        Region = new Country
                         {
                             FullName = @"Spain",
                             FlagName = @"ES",
@@ -51,7 +51,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 4608074,
                         Username = @"Skycries",
-                        Region = new Region
+                        Region = new Country
                         {
                             FullName = @"Brazil",
                             FlagName = @"BR",
@@ -69,7 +69,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 1014222,
                         Username = @"eLy",
-                        Region = new Region
+                        Region = new Country
                         {
                             FullName = @"Japan",
                             FlagName = @"JP",
@@ -87,7 +87,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 1541390,
                         Username = @"Toukai",
-                        Region = new Region
+                        Region = new Country
                         {
                             FullName = @"Canada",
                             FlagName = @"CA",
@@ -105,7 +105,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 2243452,
                         Username = @"Satoruu",
-                        Region = new Region
+                        Region = new Country
                         {
                             FullName = @"Venezuela",
                             FlagName = @"VE",
@@ -123,7 +123,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 2705430,
                         Username = @"Mooha",
-                        Region = new Region
+                        Region = new Country
                         {
                             FullName = @"France",
                             FlagName = @"FR",
@@ -141,7 +141,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 7151382,
                         Username = @"Mayuri Hana",
-                        Region = new Region
+                        Region = new Country
                         {
                             FullName = @"Thailand",
                             FlagName = @"TH",
@@ -159,7 +159,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 2051389,
                         Username = @"FunOrange",
-                        Region = new Region
+                        Region = new Country
                         {
                             FullName = @"Canada",
                             FlagName = @"CA",
@@ -177,7 +177,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 6169483,
                         Username = @"-Hebel-",
-                        Region = new Region
+                        Region = new Country
                         {
                             FullName = @"Mexico",
                             FlagName = @"MX",
@@ -195,7 +195,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 6702666,
                         Username = @"prhtnsm",
-                        Region = new Region
+                        Region = new Country
                         {
                             FullName = @"Germany",
                             FlagName = @"DE",
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 1c745ff7cb..2ed5de9ab4 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         private const float corner_radius = 5;
         private const float edge_margin = 10;
         private const float background_alpha = 0.25f;
-        private const float score_rank_size = 40f;
+        private const float index_width = 40;
 
         private readonly EdgeEffect imageShadow = new EdgeEffect
         {
@@ -129,7 +129,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                 new Container
                 {
                     RelativeSizeAxes = Axes.Y,
-                    Width = 40,
+                    Width = index_width,
                     Children = new[]
                     {
                         new OsuSpriteText
@@ -145,7 +145,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                 content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = 40, },
+                    Padding = new MarginPadding { Left = index_width, },
                     Children = new Drawable[]
                     {
                         new Container
@@ -213,7 +213,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                     AutoSizeAxes = Axes.Both,
                                                     Direction = FillDirection.Horizontal,
                                                     Spacing = new Vector2(10f, 0f),
-                                                    Margin = new MarginPadding { Left = 10, },
+                                                    Margin = new MarginPadding { Left = edge_margin, },
                                                     Children = new Drawable[]
                                                     {
                                                         maxCombo = new ScoreComponentLabel(FontAwesome.fa_link, Score.MaxCombo.ToString()),
@@ -224,26 +224,39 @@ namespace osu.Game.Screens.Select.Leaderboards
                                         },
                                     },
                                 },
-                                scoreRank = new DrawableRank(Score.Rank)
+                                new FillFlowContainer
                                 {
+                                    AutoSizeAxes = Axes.Both,
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
-                                    Size = new Vector2(score_rank_size),
-                                    Position = new Vector2(0f, -10f),
-                                },
-                                scoreLabel = new GlowingSpriteText(Score.TotalScore.ToString(@"N0"), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
-                                {
-                                    Anchor = Anchor.TopRight,
-                                    Origin = Anchor.TopRight,
-                                    Position = new Vector2(-score_rank_size - 5f, 0f),
+                                    Direction = FillDirection.Horizontal,
+                                    Spacing = new Vector2(5f, 0f),
+                                    Children = new Drawable[]
+                                    {
+                                        scoreLabel = new GlowingSpriteText(Score.TotalScore.ToString(@"N0"), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
+                                        {
+                                            
+                                        },
+                                        new Container
+                                        {
+                                            Size = new Vector2(40f, 20f),
+                                            Children = new[]
+                                            {
+                                                scoreRank = new DrawableRank(Score.Rank)
+                                                {
+                                                    Anchor = Anchor.Centre,
+                                                    Origin = Anchor.Centre,
+                                                    Size = new Vector2(40f),
+                                                },
+                                            },
+                                        },
+                                    },
                                 },
                                 modsContainer = new FillFlowContainer<ScoreModIcon>
                                 {
                                     Anchor = Anchor.BottomRight,
                                     Origin = Anchor.BottomRight,
                                     AutoSizeAxes = Axes.Both,
-                                    // TODO: Probably remove? Seems like others don't like this kind of thing
-                                    Position = new Vector2(0f, 4f), //properly align the mod icons
                                     Direction = FillDirection.Horizontal,
                                 },
                             },
@@ -325,6 +338,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                         Colour = colour,
                         Shadow = true,
                         TextSize = 30,
+                        UseFullGlyphHeight = false,
                     },
                     new TextAwesome
                     {
@@ -333,6 +347,8 @@ namespace osu.Game.Screens.Select.Leaderboards
                         Icon = icon,
                         Colour = OsuColour.Gray(84),
                         TextSize = 18,
+                        Position = new Vector2(0f, 2f),
+                        UseFullGlyphHeight = false,
                     },
                 };
             }
diff --git a/osu.Game/Screens/Tournament/Drawings.cs b/osu.Game/Screens/Tournament/Drawings.cs
index 98528c1b31..e6e718a8bb 100644
--- a/osu.Game/Screens/Tournament/Drawings.cs
+++ b/osu.Game/Screens/Tournament/Drawings.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Tournament
         private GroupContainer groupsContainer;
         private OsuSpriteText fullTeamNameText;
 
-        private List<Region> allTeams = new List<Region>();
+        private List<Country> allTeams = new List<Country>();
 
         private DrawingsConfigManager drawingsConfig;
 
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.Tournament
             reset(true);
         }
 
-        private void onTeamSelected(Region team)
+        private void onTeamSelected(Country team)
         {
             groupsContainer.AddTeam(team);
 
@@ -276,13 +276,13 @@ namespace osu.Game.Screens.Tournament
             teamsContainer.ClearTeams();
             allTeams.Clear();
 
-            foreach (Region r in TeamList.Teams)
+            foreach (Country t in TeamList.Teams)
             {
-                if (groupsContainer.ContainsTeam(r.FullName))
+                if (groupsContainer.ContainsTeam(t.FullName))
                     continue;
 
-                allTeams.Add(r);
-                teamsContainer.AddTeam(r);
+                allTeams.Add(t);
+                teamsContainer.AddTeam(t);
             }
         }
 
@@ -312,7 +312,7 @@ namespace osu.Game.Screens.Tournament
                             if (line.ToUpper().StartsWith("GROUP"))
                                 continue;
 
-                            Region teamToAdd = allTeams.FirstOrDefault(r => r.FullName == line);
+                            Country teamToAdd = allTeams.FirstOrDefault(t => t.FullName == line);
 
                             if (teamToAdd == null)
                                 continue;
diff --git a/osu.Game/Screens/Tournament/Group.cs b/osu.Game/Screens/Tournament/Group.cs
index d1fb6ab18c..fb85262d9a 100644
--- a/osu.Game/Screens/Tournament/Group.cs
+++ b/osu.Game/Screens/Tournament/Group.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Tournament
             };
         }
 
-        public void AddTeam(Region team)
+        public void AddTeam(Country team)
         {
             GroupTeam gt = new GroupTeam(team);
 
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Tournament
             return allTeams.Any(t => t.Team.FullName == fullName);
         }
 
-        public bool RemoveTeam(Region team)
+        public bool RemoveTeam(Country team)
         {
             allTeams.RemoveAll(gt => gt.Team == team);
 
@@ -122,12 +122,12 @@ namespace osu.Game.Screens.Tournament
 
         private class GroupTeam : Container
         {
-            public Region Team;
+            public Country Team;
 
             private FillFlowContainer innerContainer;
             private Sprite flagSprite;
 
-            public GroupTeam(Region team)
+            public GroupTeam(Country team)
             {
                 Team = team;
 
diff --git a/osu.Game/Screens/Tournament/GroupContainer.cs b/osu.Game/Screens/Tournament/GroupContainer.cs
index b99819fe4f..25fd06c9c5 100644
--- a/osu.Game/Screens/Tournament/GroupContainer.cs
+++ b/osu.Game/Screens/Tournament/GroupContainer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Tournament
             }
         }
 
-        public void AddTeam(Region team)
+        public void AddTeam(Country team)
         {
             if (groups[currentGroup].TeamsCount == maxTeams)
                 return;
diff --git a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
index 0f3f629fd1..425ff0bd51 100644
--- a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
+++ b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
@@ -22,9 +22,9 @@ namespace osu.Game.Screens.Tournament
     public class ScrollingTeamContainer : Container
     {
         public event Action OnScrollStarted;
-        public event Action<Region> OnSelected;
+        public event Action<Country> OnSelected;
 
-        private readonly List<Region> availableTeams = new List<Region>();
+        private readonly List<Country> availableTeams = new List<Country>();
 
         private Container tracker;
 
@@ -158,7 +158,7 @@ namespace osu.Game.Screens.Tournament
             }
         }
 
-        public void AddTeam(Region team)
+        public void AddTeam(Country team)
         {
             if (availableTeams.Contains(team))
                 return;
@@ -169,12 +169,12 @@ namespace osu.Game.Screens.Tournament
             scrollState = ScrollState.Idle;
         }
 
-        public void AddTeams(IEnumerable<Region> teams)
+        public void AddTeams(IEnumerable<Country> teams)
         {
             if (teams == null)
                 return;
 
-            foreach (Region t in teams)
+            foreach (Country t in teams)
                 AddTeam(t);
         }
 
@@ -185,7 +185,7 @@ namespace osu.Game.Screens.Tournament
             scrollState = ScrollState.Idle;
         }
 
-        public void RemoveTeam(Region team)
+        public void RemoveTeam(Country team)
         {
             availableTeams.Remove(team);
 
@@ -270,9 +270,9 @@ namespace osu.Game.Screens.Tournament
 
         private void addFlags()
         {
-            foreach (Region r in availableTeams)
+            foreach (Country t in availableTeams)
             {
-                Add(new ScrollingTeam(r)
+                Add(new ScrollingTeam(t)
                 {
                     X = leftPos + DrawWidth
                 });
@@ -326,7 +326,7 @@ namespace osu.Game.Screens.Tournament
             public const float WIDTH = 58;
             public const float HEIGHT = 41;
 
-            public Region Team;
+            public Country Team;
 
             private Sprite flagSprite;
             private Box outline;
@@ -346,7 +346,7 @@ namespace osu.Game.Screens.Tournament
                 }
             }
 
-            public ScrollingTeam(Region team)
+            public ScrollingTeam(Country team)
             {
                 Team = team;
 
diff --git a/osu.Game/Screens/Tournament/Teams/ITeamList.cs b/osu.Game/Screens/Tournament/Teams/ITeamList.cs
index b1093968cd..d4b644e2aa 100644
--- a/osu.Game/Screens/Tournament/Teams/ITeamList.cs
+++ b/osu.Game/Screens/Tournament/Teams/ITeamList.cs
@@ -8,6 +8,6 @@ namespace osu.Game.Screens.Tournament.Teams
 {
     public interface ITeamList
     {
-        IEnumerable<Region> Teams { get; }
+        IEnumerable<Country> Teams { get; }
     }
 }
diff --git a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
index 76f871d202..aca36a484d 100644
--- a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
+++ b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
@@ -21,11 +21,11 @@ namespace osu.Game.Screens.Tournament.Teams
             this.storage = storage;
         }
 
-        public IEnumerable<Region> Teams
+        public IEnumerable<Country> Teams
         {
             get
             {
-                var teams = new List<Region>();
+                var teams = new List<Country>();
 
                 try
                 {
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Tournament.Teams
                             string acronym = split.Length >= 3 ? split[2].Trim() : teamName;
                             acronym = acronym.Substring(0, Math.Min(3, acronym.Length));
 
-                            teams.Add(new Region
+                            teams.Add(new Country
                             {
                                 FlagName = flagName,
                                 FullName = teamName,
diff --git a/osu.Game/Users/Region.cs b/osu.Game/Users/Country.cs
similarity index 91%
rename from osu.Game/Users/Region.cs
rename to osu.Game/Users/Country.cs
index 2b1f9eb980..44879a2a8d 100644
--- a/osu.Game/Users/Region.cs
+++ b/osu.Game/Users/Country.cs
@@ -10,10 +10,10 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Users
 {
-    public class Region : IHasDrawableRepresentation<DrawableFlag>
+    public class Country : IHasDrawableRepresentation<DrawableFlag>
     {
         /// <summary>
-        /// The name of this team.
+        /// The name of this country.
         /// </summary>
         public string FullName;
 
diff --git a/osu.Game/Users/Team.cs b/osu.Game/Users/Team.cs
index ae89aef293..13401aa241 100644
--- a/osu.Game/Users/Team.cs
+++ b/osu.Game/Users/Team.cs
@@ -10,14 +10,10 @@ namespace osu.Game.Users
     public class Team : IHasDrawableRepresentation<Sprite>
     {
         public string Name;
-        public Texture Flag; // TODO: Replace this with something better
 
         public Sprite CreateDrawable()
         {
-            return new Sprite
-            {
-                Texture = Flag,
-            };
+            return new Sprite { };
         }
     }
 }
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index d3e1f730cc..6ac2cbfc2d 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -7,7 +7,7 @@ namespace osu.Game.Users
     {
         public int Id;
         public string Username;
-        public Region Region;
+        public Country Region;
         public Team Team;
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9ec504117e..cb8fbf8cb0 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -350,7 +350,7 @@
     <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
     <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
     <Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
-    <Compile Include="Users\Region.cs" />
+    <Compile Include="Users\Country.cs" />
     <Compile Include="Users\Team.cs" />
     <Compile Include="Modes\ScoreRank.cs" />
     <Compile Include="Users\Avatar.cs" />

From 82c02fa1fcdd3572a3f8d765ae0cf15e9ba1281c Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Fri, 17 Mar 2017 18:29:55 -0300
Subject: [PATCH 55/94] Formatting

---
 .../Screens/Select/Leaderboards/LeaderboardScore.cs | 13 ++++---------
 osu.Game/Users/Team.cs                              |  3 +--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index c9788c6361..2ddebc2437 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         private const float corner_radius = 5;
         private const float edge_margin = 10;
         private const float background_alpha = 0.25f;
-        private const float index_width = 40;
+        private const float rank_width = 30;
 
         private readonly EdgeEffect imageShadow = new EdgeEffect
         {
@@ -124,14 +124,12 @@ namespace osu.Game.Screens.Select.Leaderboards
             flag.Width = 30;
             flag.RelativeSizeAxes = Axes.Y;
 
-            const float rank_width = 30;
-
             Children = new Drawable[]
             {
                 new Container
                 {
                     RelativeSizeAxes = Axes.Y,
-                    Width = index_width,
+                    Width = rank_width,
                     Children = new[]
                     {
                         new OsuSpriteText
@@ -147,7 +145,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                 content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = index_width, },
+                    Padding = new MarginPadding { Left = rank_width, },
                     Children = new Drawable[]
                     {
                         new Container
@@ -235,10 +233,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     Spacing = new Vector2(5f, 0f),
                                     Children = new Drawable[]
                                     {
-                                        scoreLabel = new GlowingSpriteText(Score.TotalScore.ToString(@"N0"), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa"))
-                                        {
-                                            
-                                        },
+                                        scoreLabel = new GlowingSpriteText(Score.TotalScore.ToString(@"N0"), @"Venera", 23, Color4.White, OsuColour.FromHex(@"83ccfa")),
                                         new Container
                                         {
                                             Size = new Vector2(40f, 20f),
diff --git a/osu.Game/Users/Team.cs b/osu.Game/Users/Team.cs
index 13401aa241..3772b32e83 100644
--- a/osu.Game/Users/Team.cs
+++ b/osu.Game/Users/Team.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Users
@@ -13,7 +12,7 @@ namespace osu.Game.Users
 
         public Sprite CreateDrawable()
         {
-            return new Sprite { };
+            return new Sprite();
         }
     }
 }

From 137611ecf365f21f436ace3ec29b13ca896137e7 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Fri, 17 Mar 2017 19:07:45 -0300
Subject: [PATCH 56/94] Use LeaderboardScore height for fade

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs      | 8 ++++----
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index b94f9df70c..238abcaf1c 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -81,15 +81,15 @@ namespace osu.Game.Screens.Select.Leaderboards
             base.Update();
 
             var fadeStart = scrollContainer.DrawHeight - 10;
-            fadeStart += scrollContainer.IsScrolledToEnd() ? 70 : 0;
+            fadeStart += scrollContainer.IsScrolledToEnd() ? LeaderboardScore.HEIGHT : 0;
 
             foreach (var s in scrollFlow.Children)
             {
                 var topY = scrollContainer.ScrollContent.DrawPosition.Y + s.DrawPosition.Y;
-                var bottomY = topY + 70;
+                var bottomY = topY + LeaderboardScore.HEIGHT;
 
-                s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / 70, 1)),
-                                                           Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / 70, 1)));
+                s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / LeaderboardScore.HEIGHT, 1)),
+                                                           Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / LeaderboardScore.HEIGHT, 1)));
             }
         }
     }
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 2ddebc2437..febf1e76c9 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 {
     public class LeaderboardScore : Container, IStateful<Visibility>
     {
-        private const float height = 70;
+        public static readonly float HEIGHT = 70;
         private const float corner_radius = 5;
         private const float edge_margin = 10;
         private const float background_alpha = 0.25f;
@@ -118,7 +118,7 @@ namespace osu.Game.Screens.Select.Leaderboards
             Rank = rank;
 
             RelativeSizeAxes = Axes.X;
-            Height = height;
+            Height = HEIGHT;
 
             var flag = Score.User?.Region.CreateDrawable() ?? new DrawableFlag();
             flag.Width = 30;
@@ -171,7 +171,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                             {
                                 avatar = new Avatar
                                 {
-                                    Size = new Vector2(height - edge_margin * 2, height - edge_margin * 2),
+                                    Size = new Vector2(HEIGHT - edge_margin * 2, HEIGHT - edge_margin * 2),
                                     CornerRadius = corner_radius,
                                     Masking = true,
                                     EdgeEffect = imageShadow,
@@ -181,7 +181,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                 {
                                     RelativeSizeAxes = Axes.Y,
                                     AutoSizeAxes = Axes.X,
-                                    Position = new Vector2(height - edge_margin, 0f),
+                                    Position = new Vector2(HEIGHT - edge_margin, 0f),
                                     Children = new Drawable[]
                                     {
                                         nameLabel = new OsuSpriteText

From fbb8e79f1ae12b900dd0065c90e8fc92ff5bc6fa Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Fri, 17 Mar 2017 19:45:51 -0300
Subject: [PATCH 57/94] Move ctor above methods

---
 .../Select/Leaderboards/LeaderboardScore.cs   | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index febf1e76c9..4d83df6a93 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -96,22 +96,6 @@ namespace osu.Game.Screens.Select.Leaderboards
             }
         }
 
-        public override void Hide() => State = Visibility.Hidden;
-        public override void Show() => State = Visibility.Visible;
-        public void ToggleVisibility() => State = State == Visibility.Visible ? Visibility.Hidden : Visibility.Visible;
-
-        protected override bool OnHover(Framework.Input.InputState state)
-        {
-            background.FadeTo(0.5f, 300, EasingTypes.OutQuint);
-            return base.OnHover(state);
-        }
-
-        protected override void OnHoverLost(Framework.Input.InputState state)
-        {
-            background.FadeTo(background_alpha, 200, EasingTypes.OutQuint);
-            base.OnHoverLost(state);
-        }
-
         public LeaderboardScore(Score score, int rank)
         {
             Score = score;
@@ -272,6 +256,23 @@ namespace osu.Game.Screens.Select.Leaderboards
             }
         }
 
+        public void ToggleVisibility() => State = State == Visibility.Visible ? Visibility.Hidden : Visibility.Visible;
+
+        public override void Hide() => State = Visibility.Hidden;
+        public override void Show() => State = Visibility.Visible;
+
+        protected override bool OnHover(Framework.Input.InputState state)
+        {
+            background.FadeTo(0.5f, 300, EasingTypes.OutQuint);
+            return base.OnHover(state);
+        }
+
+        protected override void OnHoverLost(Framework.Input.InputState state)
+        {
+            background.FadeTo(background_alpha, 200, EasingTypes.OutQuint);
+            base.OnHoverLost(state);
+        }
+
         private class GlowingSpriteText : Container
         {
             public GlowingSpriteText(string text, string font, int textSize, Color4 textColour, Color4 glowColour)

From b9d5ab5d8c45cf8d73f0952ea486a53bf8a3c2b9 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 18 Mar 2017 01:44:05 -0300
Subject: [PATCH 58/94] Only calculate fade for fading leaderboard scores

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 238abcaf1c..7ad80dce76 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -88,8 +88,15 @@ namespace osu.Game.Screens.Select.Leaderboards
                 var topY = scrollContainer.ScrollContent.DrawPosition.Y + s.DrawPosition.Y;
                 var bottomY = topY + LeaderboardScore.HEIGHT;
 
-                s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / LeaderboardScore.HEIGHT, 1)),
+                if (topY < fadeStart - (LeaderboardScore.HEIGHT * 2))
+                {
+                    s.ColourInfo = ColourInfo.GradientVertical(Color4.White, Color4.White);
+                }
+                else
+                {
+                    s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / LeaderboardScore.HEIGHT, 1)),
                                                            Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / LeaderboardScore.HEIGHT, 1)));
+                }
             }
         }
     }

From e78069af12ce6ff0958c317c333ccb0c0cb228e5 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 18 Mar 2017 01:48:29 -0300
Subject: [PATCH 59/94] Parenthesis

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 7ad80dce76..655754b4a7 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                 var topY = scrollContainer.ScrollContent.DrawPosition.Y + s.DrawPosition.Y;
                 var bottomY = topY + LeaderboardScore.HEIGHT;
 
-                if (topY < fadeStart - (LeaderboardScore.HEIGHT * 2))
+                if (topY < fadeStart - LeaderboardScore.HEIGHT * 2)
                 {
                     s.ColourInfo = ColourInfo.GradientVertical(Color4.White, Color4.White);
                 }

From 0bc8ed9c9e4c31c472fa26b0ef8af0f564422cab Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sat, 18 Mar 2017 01:56:19 -0300
Subject: [PATCH 60/94] Use Colour for non-faded scores

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 655754b4a7..dc5da7ebdf 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
                 if (topY < fadeStart - LeaderboardScore.HEIGHT * 2)
                 {
-                    s.ColourInfo = ColourInfo.GradientVertical(Color4.White, Color4.White);
+                    s.Colour = Color4.White;
                 }
                 else
                 {

From 80de15d935b5c7b3b1a1122f9eccfdc7f17b57e7 Mon Sep 17 00:00:00 2001
From: Jorolf <jorolf@gmx.de>
Date: Sat, 18 Mar 2017 15:22:03 +0100
Subject: [PATCH 61/94] fixed typo

---
 osu.Game/Overlays/Options/Sections/SkinSection.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Options/Sections/SkinSection.cs b/osu.Game/Overlays/Options/Sections/SkinSection.cs
index c9c1e723f0..bca4016401 100644
--- a/osu.Game/Overlays/Options/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Options/Sections/SkinSection.cs
@@ -61,12 +61,12 @@ namespace osu.Game.Overlays.Options.Sections
                 },
                 new OptionSlider<double>
                 {
-                    LabelText = "Menu Cursor size",
+                    LabelText = "Menu cursor size",
                     Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.CursorSize)
                 },
                 new OptionSlider<double>
                 {
-                    LabelText = "Gameplay Cursor size",
+                    LabelText = "Gameplay cursor size",
                     Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.GameplayCursorSize)
                 },
                 new OsuCheckbox
@@ -77,4 +77,4 @@ namespace osu.Game.Overlays.Options.Sections
             };
         }
     }
-}
\ No newline at end of file
+}

From b0e7296e25a2a0ee83efe48af1c05f115a1f4f5d Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sun, 19 Mar 2017 00:09:58 -0300
Subject: [PATCH 62/94] -IHasDrawableRepresentation, User.Region -> Country

---
 .../Tests/TestCaseLeaderboard.cs              | 20 +++++++++----------
 .../IHasDrawableRepresentation.cs             | 12 -----------
 .../Select/Leaderboards/LeaderboardScore.cs   | 10 +++++-----
 osu.Game/Users/Country.cs                     |  7 +------
 osu.Game/Users/Team.cs                        |  7 +------
 osu.Game/Users/User.cs                        |  2 +-
 osu.Game/osu.Game.csproj                      |  1 -
 7 files changed, 18 insertions(+), 41 deletions(-)
 delete mode 100644 osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index aa53d773a0..cc30e3de95 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -33,7 +33,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 6602580,
                         Username = @"waaiiru",
-                        Region = new Country
+                        Country = new Country
                         {
                             FullName = @"Spain",
                             FlagName = @"ES",
@@ -51,7 +51,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 4608074,
                         Username = @"Skycries",
-                        Region = new Country
+                        Country = new Country
                         {
                             FullName = @"Brazil",
                             FlagName = @"BR",
@@ -69,7 +69,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 1014222,
                         Username = @"eLy",
-                        Region = new Country
+                        Country = new Country
                         {
                             FullName = @"Japan",
                             FlagName = @"JP",
@@ -87,7 +87,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 1541390,
                         Username = @"Toukai",
-                        Region = new Country
+                        Country = new Country
                         {
                             FullName = @"Canada",
                             FlagName = @"CA",
@@ -105,7 +105,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 2243452,
                         Username = @"Satoruu",
-                        Region = new Country
+                        Country = new Country
                         {
                             FullName = @"Venezuela",
                             FlagName = @"VE",
@@ -123,7 +123,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 2705430,
                         Username = @"Mooha",
-                        Region = new Country
+                        Country = new Country
                         {
                             FullName = @"France",
                             FlagName = @"FR",
@@ -141,7 +141,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 7151382,
                         Username = @"Mayuri Hana",
-                        Region = new Country
+                        Country = new Country
                         {
                             FullName = @"Thailand",
                             FlagName = @"TH",
@@ -159,7 +159,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 2051389,
                         Username = @"FunOrange",
-                        Region = new Country
+                        Country = new Country
                         {
                             FullName = @"Canada",
                             FlagName = @"CA",
@@ -177,7 +177,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 6169483,
                         Username = @"-Hebel-",
-                        Region = new Country
+                        Country = new Country
                         {
                             FullName = @"Mexico",
                             FlagName = @"MX",
@@ -195,7 +195,7 @@ namespace osu.Desktop.VisualTests.Tests
                     {
                         Id = 6702666,
                         Username = @"prhtnsm",
-                        Region = new Country
+                        Country = new Country
                         {
                             FullName = @"Germany",
                             FlagName = @"DE",
diff --git a/osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs b/osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs
deleted file mode 100644
index f0265f485d..0000000000
--- a/osu.Game/Graphics/UserInterface/IHasDrawableRepresentation.cs
+++ /dev/null
@@ -1,12 +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;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public interface IHasDrawableRepresentation<out T> where T : Drawable
-    {
-        T CreateDrawable();
-    }
-}
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 4d83df6a93..ed873afb44 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -104,10 +104,6 @@ namespace osu.Game.Screens.Select.Leaderboards
             RelativeSizeAxes = Axes.X;
             Height = HEIGHT;
 
-            var flag = Score.User?.Region.CreateDrawable() ?? new DrawableFlag();
-            flag.Width = 30;
-            flag.RelativeSizeAxes = Axes.Y;
-
             Children = new Drawable[]
             {
                 new Container
@@ -189,7 +185,11 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                     Masking = true,
                                                     Children = new Drawable[]
                                                     {
-                                                        flag,
+                                                        new DrawableFlag(Score.User?.Country?.FlagName ?? "__")
+                                                        {
+                                                            Width = 30,
+                                                            RelativeSizeAxes = Axes.Y,
+                                                        },
                                                     },
                                                 },
                                                 new FillFlowContainer
diff --git a/osu.Game/Users/Country.cs b/osu.Game/Users/Country.cs
index 44879a2a8d..f687350e5b 100644
--- a/osu.Game/Users/Country.cs
+++ b/osu.Game/Users/Country.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Users
 {
-    public class Country : IHasDrawableRepresentation<DrawableFlag>
+    public class Country
     {
         /// <summary>
         /// The name of this country.
@@ -26,11 +26,6 @@ namespace osu.Game.Users
         /// Two-letter flag acronym (ISO 3166 standard)
         /// </summary>
         public string FlagName;
-
-        public DrawableFlag CreateDrawable()
-        {
-            return new DrawableFlag(FlagName);
-        }
     }
 
     public class DrawableFlag : Container
diff --git a/osu.Game/Users/Team.cs b/osu.Game/Users/Team.cs
index 3772b32e83..361354b8f9 100644
--- a/osu.Game/Users/Team.cs
+++ b/osu.Game/Users/Team.cs
@@ -6,13 +6,8 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Users
 {
-    public class Team : IHasDrawableRepresentation<Sprite>
+    public class Team
     {
         public string Name;
-
-        public Sprite CreateDrawable()
-        {
-            return new Sprite();
-        }
     }
 }
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 6ac2cbfc2d..2763b3100f 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -7,7 +7,7 @@ namespace osu.Game.Users
     {
         public int Id;
         public string Username;
-        public Country Region;
+        public Country Country;
         public Team Team;
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fd55305572..3273336112 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -354,7 +354,6 @@
     <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
     <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
     <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
-    <Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
     <Compile Include="Users\Country.cs" />
     <Compile Include="Users\Team.cs" />
     <Compile Include="Modes\ScoreRank.cs" />

From 5c645350f95413e9b30da343bb97bc9b3c7b224c Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Sun, 19 Mar 2017 00:14:23 -0300
Subject: [PATCH 63/94] Formatting

---
 osu.Game/Users/Country.cs | 1 -
 osu.Game/Users/Team.cs    | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/osu.Game/Users/Country.cs b/osu.Game/Users/Country.cs
index f687350e5b..513d256808 100644
--- a/osu.Game/Users/Country.cs
+++ b/osu.Game/Users/Country.cs
@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Users
 {
diff --git a/osu.Game/Users/Team.cs b/osu.Game/Users/Team.cs
index 361354b8f9..7d5c0322fe 100644
--- a/osu.Game/Users/Team.cs
+++ b/osu.Game/Users/Team.cs
@@ -1,9 +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.Sprites;
-using osu.Game.Graphics.UserInterface;
-
 namespace osu.Game.Users
 {
     public class Team

From 8cb334a118f79f162bfe3a7ee6eb7d986f9555ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Mar 2017 16:34:29 +0900
Subject: [PATCH 64/94] Adjust sizing a touch.

---
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index ed873afb44..4ea5567dad 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Screens.Select.Leaderboards
 {
     public class LeaderboardScore : Container, IStateful<Visibility>
     {
-        public static readonly float HEIGHT = 70;
+        public static readonly float HEIGHT = 60;
         private const float corner_radius = 5;
-        private const float edge_margin = 10;
+        private const float edge_margin = 5;
         private const float background_alpha = 0.25f;
         private const float rank_width = 30;
 

From 256a3268ac06ac081103308328b0b5eb844cd967 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Mar 2017 17:29:10 +0900
Subject: [PATCH 65/94] Inline single usage of EdgeEffect.

---
 .../Select/Leaderboards/LeaderboardScore.cs        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 4ea5567dad..c046d3a2f8 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -26,13 +26,6 @@ namespace osu.Game.Screens.Select.Leaderboards
         private const float background_alpha = 0.25f;
         private const float rank_width = 30;
 
-        private readonly EdgeEffect imageShadow = new EdgeEffect
-        {
-            Type = EdgeEffectType.Shadow,
-            Radius = 1,
-            Colour = Color4.Black.Opacity(0.2f),
-        };
-
         private Box background;
         private Container content, avatar;
         private DrawableRank scoreRank;
@@ -154,7 +147,12 @@ namespace osu.Game.Screens.Select.Leaderboards
                                     Size = new Vector2(HEIGHT - edge_margin * 2, HEIGHT - edge_margin * 2),
                                     CornerRadius = corner_radius,
                                     Masking = true,
-                                    EdgeEffect = imageShadow,
+                                    EdgeEffect = new EdgeEffect
+                                    {
+                                        Type = EdgeEffectType.Shadow,
+                                        Radius = 1,
+                                        Colour = Color4.Black.Opacity(0.2f),
+                                    },
                                     UserId = Score.User?.Id ?? Score.UserID,
                                 },
                                 new Container

From f785af12226834d8119bd713f37a4d85072bba65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Mar 2017 20:12:37 +0900
Subject: [PATCH 66/94] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index e6394035d4..405537bd35 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit e6394035d443d4498b71e845e5763dd3faf98c7c
+Subproject commit 405537bd351954878ddc1d2ba53e5d0563528446

From 09bf014dedb175c3b3ead2ac1bf31f0fc28ff803 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Mar 2017 21:49:29 +0900
Subject: [PATCH 67/94] Simplify fade out gradient code.

---
 .../Select/Leaderboards/Leaderboard.cs        | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index dc5da7ebdf..db928a8aff 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Modes;
+using System;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
@@ -80,22 +81,25 @@ namespace osu.Game.Screens.Select.Leaderboards
         {
             base.Update();
 
-            var fadeStart = scrollContainer.DrawHeight - 10;
-            fadeStart += scrollContainer.IsScrolledToEnd() ? LeaderboardScore.HEIGHT : 0;
+            var fadeStart = scrollContainer.Current + scrollContainer.DrawHeight;
 
-            foreach (var s in scrollFlow.Children)
+            if (!scrollContainer.IsScrolledToEnd())
+                fadeStart -= LeaderboardScore.HEIGHT;
+
+            foreach (var c in scrollFlow.Children)
             {
-                var topY = scrollContainer.ScrollContent.DrawPosition.Y + s.DrawPosition.Y;
+                var topY = c.ToSpaceOfOtherDrawable(Vector2.Zero, scrollFlow).Y;
                 var bottomY = topY + LeaderboardScore.HEIGHT;
 
-                if (topY < fadeStart - LeaderboardScore.HEIGHT * 2)
-                {
-                    s.Colour = Color4.White;
-                }
+                if (bottomY < fadeStart)
+                    c.Colour = Color4.White;
+                else if (topY > fadeStart + LeaderboardScore.HEIGHT)
+                    c.Colour = Color4.Transparent;
                 else
                 {
-                    s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / LeaderboardScore.HEIGHT, 1)),
-                                                           Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / LeaderboardScore.HEIGHT, 1)));
+                    c.ColourInfo = ColourInfo.GradientVertical(
+                        Color4.White.Opacity(Math.Min(1 - (topY - fadeStart) / LeaderboardScore.HEIGHT, 1)),
+                        Color4.White.Opacity(Math.Min(1 - (bottomY - fadeStart) / LeaderboardScore.HEIGHT, 1)));
                 }
             }
         }

From 1d13924e0a9051d8f5582b9922c0e8bcd27d2a54 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Tue, 21 Mar 2017 01:05:48 +0800
Subject: [PATCH 68/94] Remove redundant type parameter. Nested type has
 implicit type parameter from base type.

---
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index d5699eddaf..de81757fdf 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        protected override DropDownMenu<T> CreateDropDownMenu() => new OsuTabDropDownMenu<T>();
+        protected override DropDownMenu<T> CreateDropDownMenu() => new OsuTabDropDownMenu();
 
         protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
 
@@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 accentColour = value;
-                var dropDown = DropDown as OsuTabDropDownMenu<T>;
+                var dropDown = DropDown as OsuTabDropDownMenu;
                 if (dropDown != null)
                     dropDown.AccentColour = value;
                 foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
@@ -53,7 +53,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public class OsuTabDropDownMenu<T1> : OsuDropDownMenu<T1>
+        public class OsuTabDropDownMenu : OsuDropDownMenu<T>
         {
             protected override DropDownHeader CreateHeader() => new OsuTabDropDownHeader
             {
@@ -62,7 +62,7 @@ namespace osu.Game.Graphics.UserInterface
                 Origin = Anchor.TopRight,
             };
 
-            protected override DropDownMenuItem<T1> CreateDropDownItem(string key, T1 value)
+            protected override DropDownMenuItem<T> CreateDropDownItem(string key, T value)
             {
                 var item = base.CreateDropDownItem(key, value);
                 item.ForegroundColourHover = Color4.Black;

From 82d612906378a443c40fb7b3eae31d5227e7a7f4 Mon Sep 17 00:00:00 2001
From: Jorolf <jorolf@gmx.de>
Date: Tue, 21 Mar 2017 17:16:23 +0100
Subject: [PATCH 69/94] renamed CursorSize to MenuCursorSize

---
 osu.Game/Configuration/OsuConfigManager.cs        | 4 ++--
 osu.Game/Graphics/Cursor/MenuCursor.cs            | 2 +-
 osu.Game/Overlays/Options/Sections/SkinSection.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index f7d5e69fd3..1442a26a06 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Configuration
             Set(OsuConfig.SavePassword, false);
             Set(OsuConfig.SaveUsername, true);
 
-            Set(OsuConfig.CursorSize, 1.0, 0.5f, 2);
+            Set(OsuConfig.MenuCursorSize, 1.0, 0.5f, 2);
             Set(OsuConfig.GameplayCursorSize, 1.0, 0.5f, 2);
             Set(OsuConfig.DimLevel, 30, 0, 100);
 
@@ -224,7 +224,7 @@ namespace osu.Game.Configuration
         ComboFireHeight,
         ConfirmExit,
         AutoSendNowPlaying,
-        CursorSize,
+        MenuCursorSize,
         GameplayCursorSize,
         AutomaticCursorSizing,
         DimLevel,
diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 1447fa9417..e2144d50ef 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Graphics.Cursor
             [BackgroundDependencyLoader]
             private void load(OsuConfigManager config, TextureStore textures, OsuColour colour)
             {
-                cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
+                cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
 
                 Children = new Drawable[]
                 {
diff --git a/osu.Game/Overlays/Options/Sections/SkinSection.cs b/osu.Game/Overlays/Options/Sections/SkinSection.cs
index bca4016401..0ee561c1ad 100644
--- a/osu.Game/Overlays/Options/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Options/Sections/SkinSection.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Overlays.Options.Sections
                 new OptionSlider<double>
                 {
                     LabelText = "Menu cursor size",
-                    Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.CursorSize)
+                    Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.MenuCursorSize)
                 },
                 new OptionSlider<double>
                 {

From 3270fdcfdef25fa6319cb80cd6391d36c49b663e Mon Sep 17 00:00:00 2001
From: Adrian Wielgosik <adrian.wielgosik@gmail.com>
Date: Tue, 21 Mar 2017 22:48:33 +0100
Subject: [PATCH 70/94] Fix auto-sliders in TestCaseHitObject

---
 osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
index a2a52c7d94..e9db97a67b 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
@@ -158,6 +158,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
+            if (!IsLoaded) return;
+
             base.UpdateState(state);
 
             ball.FadeIn();

From f0edf5d3d3ec772961c51cce18e45af51c199b61 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 22 Mar 2017 06:51:26 +0800
Subject: [PATCH 71/94] Update to DropDown and Menu.

---
 .../Graphics/UserInterface/OsuDropDown.cs     | 40 ++++++++++++
 .../Graphics/UserInterface/OsuDropDownMenu.cs | 61 -------------------
 osu.Game/Graphics/UserInterface/OsuMenu.cs    | 34 +++++++++++
 .../Graphics/UserInterface/OsuTabControl.cs   | 20 +++---
 osu.Game/Overlays/Options/OptionDropDown.cs   |  4 +-
 osu.Game/osu.Game.csproj                      |  3 +-
 6 files changed, 88 insertions(+), 74 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/OsuDropDown.cs
 delete mode 100644 osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
 create mode 100644 osu.Game/Graphics/UserInterface/OsuMenu.cs

diff --git a/osu.Game/Graphics/UserInterface/OsuDropDown.cs b/osu.Game/Graphics/UserInterface/OsuDropDown.cs
new file mode 100644
index 0000000000..51fb335698
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/OsuDropDown.cs
@@ -0,0 +1,40 @@
+// 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 OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.UserInterface;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuDropDown<T> : DropDown<T>
+    {
+        protected override DropDownHeader CreateHeader() => new OsuDropDownHeader { AccentColour = AccentColour };
+
+        protected override Menu CreateMenu() => new OsuMenu();
+
+        private Color4? accentColour;
+        public virtual Color4 AccentColour
+        {
+            get { return accentColour.GetValueOrDefault(); }
+            set
+            {
+                accentColour = value;
+                if (Header != null)
+                    ((OsuDropDownHeader)Header).AccentColour = value;
+                foreach (var item in MenuItems.OfType<OsuDropDownMenuItem<T>>())
+                    item.AccentColour = value;
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            if (accentColour == null)
+                AccentColour = colours.PinkDarker;
+        }
+
+        protected override DropDownMenuItem<T> CreateMenuItem(string key, T value) => new OsuDropDownMenuItem<T>(key, value) { AccentColour = AccentColour };
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs b/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
deleted file mode 100644
index 5d9e30db8d..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
+++ /dev/null
@@ -1,61 +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.Linq;
-using osu.Framework.Allocation;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.Graphics.UserInterface;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuDropDownMenu<T> : DropDownMenu<T>
-    {
-        protected override DropDownHeader CreateHeader() => new OsuDropDownHeader { AccentColour = AccentColour };
-
-        private Color4? accentColour;
-        public virtual Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                if (Header != null)
-                    ((OsuDropDownHeader)Header).AccentColour = value;
-                foreach (var item in ItemList.OfType<OsuDropDownMenuItem<T>>())
-                    item.AccentColour = value;
-            }
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            if (accentColour == null)
-                AccentColour = colours.PinkDarker;
-        }
-
-        public OsuDropDownMenu()
-        {
-            ContentContainer.CornerRadius = 4;
-            ContentBackground.Colour = Color4.Black.Opacity(0.5f);
-
-            DropDownItemsContainer.Padding = new MarginPadding(5);
-        }
-
-        protected override void AnimateOpen() => ContentContainer.FadeIn(300, EasingTypes.OutQuint);
-
-        protected override void AnimateClose() => ContentContainer.FadeOut(300, EasingTypes.OutQuint);
-
-        protected override void UpdateContentHeight()
-        {
-            var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight;
-            ContentContainer.ResizeTo(new Vector2(1, State == DropDownMenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint);
-        }
-
-        protected override DropDownMenuItem<T> CreateDropDownItem(string key, T value) => new OsuDropDownMenuItem<T>(key, value) { AccentColour = AccentColour };
-    }
-}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs
new file mode 100644
index 0000000000..4e80e1502a
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs
@@ -0,0 +1,34 @@
+// 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.Primitives;
+using osu.Framework.Graphics.Transforms;
+using osu.Framework.Graphics.UserInterface;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuMenu : Menu
+    {
+        public OsuMenu()
+        {
+            CornerRadius = 4;
+            ContentBackground.Colour = Color4.Black.Opacity(0.5f);
+
+            ItemsContainer.Padding = new MarginPadding(5);
+        }
+
+        protected override void AnimateOpen() => FadeIn(300, EasingTypes.OutQuint);
+
+        protected override void AnimateClose() => FadeOut(300, EasingTypes.OutQuint);
+
+        protected override void UpdateContentHeight()
+        {
+            var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight;
+            ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index de81757fdf..947b39f621 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        protected override DropDownMenu<T> CreateDropDownMenu() => new OsuTabDropDownMenu();
+        protected override DropDown<T> CreateDropDownMenu() => new OsuTabDropDown();
 
         protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
 
@@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 accentColour = value;
-                var dropDown = DropDown as OsuTabDropDownMenu;
+                var dropDown = DropDown as OsuTabDropDown;
                 if (dropDown != null)
                     dropDown.AccentColour = value;
                 foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
@@ -53,7 +53,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public class OsuTabDropDownMenu : OsuDropDownMenu<T>
+        public class OsuTabDropDown : OsuDropDown<T>
         {
             protected override DropDownHeader CreateHeader() => new OsuTabDropDownHeader
             {
@@ -62,22 +62,22 @@ namespace osu.Game.Graphics.UserInterface
                 Origin = Anchor.TopRight,
             };
 
-            protected override DropDownMenuItem<T> CreateDropDownItem(string key, T value)
+            protected override DropDownMenuItem<T> CreateMenuItem(string key, T value)
             {
-                var item = base.CreateDropDownItem(key, value);
+                var item = base.CreateMenuItem(key, value);
                 item.ForegroundColourHover = Color4.Black;
                 return item;
             }
 
-            public OsuTabDropDownMenu()
+            public OsuTabDropDown()
             {
-                ContentContainer.Anchor = Anchor.TopRight;
-                ContentContainer.Origin = Anchor.TopRight;
+                DropDownMenu.Anchor = Anchor.TopRight;
+                DropDownMenu.Origin = Anchor.TopRight;
 
                 RelativeSizeAxes = Axes.X;
 
-                ContentBackground.Colour = Color4.Black.Opacity(0.7f);
-                MaxDropDownHeight = 400;
+                DropDownMenu.Colour = Color4.Black.Opacity(0.7f);
+                DropDownMenu.MaxHeight = 400;
             }
 
             public class OsuTabDropDownHeader : OsuDropDownHeader
diff --git a/osu.Game/Overlays/Options/OptionDropDown.cs b/osu.Game/Overlays/Options/OptionDropDown.cs
index 4387e90b5a..690d3d21a5 100644
--- a/osu.Game/Overlays/Options/OptionDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionDropDown.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Options
 {
     public class OptionDropDown<T> : FillFlowContainer
     {
-        private DropDownMenu<T> dropdown;
+        private DropDown<T> dropdown;
         private SpriteText text;
 
         public string LabelText
@@ -97,7 +97,7 @@ namespace osu.Game.Overlays.Options
                 text = new OsuSpriteText {
                     Alpha = 0,
                 },
-                dropdown = new OsuDropDownMenu<T>
+                dropdown = new OsuDropDown<T>
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 188d929888..3f97e196db 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -85,6 +85,7 @@
     <Compile Include="Graphics\UserInterface\BackButton.cs" />
     <Compile Include="Graphics\UserInterface\FocusedTextBox.cs" />
     <Compile Include="Graphics\UserInterface\Nub.cs" />
+    <Compile Include="Graphics\UserInterface\OsuMenu.cs" />
     <Compile Include="Graphics\UserInterface\OsuPasswordTextBox.cs" />
     <Compile Include="Graphics\UserInterface\OsuSliderBar.cs" />
     <Compile Include="Graphics\UserInterface\OsuTextBox.cs" />
@@ -159,7 +160,7 @@
     <Compile Include="Overlays\Options\OptionDropDown.cs" />
     <Compile Include="Overlays\Options\OptionLabel.cs" />
     <Compile Include="Graphics\UserInterface\OsuDropDownHeader.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDownMenu.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropDown.cs" />
     <Compile Include="Graphics\UserInterface\OsuDropDownMenuItem.cs" />
     <Compile Include="Overlays\Options\OptionsFooter.cs" />
     <Compile Include="Overlays\Options\Sections\DebugSection.cs" />

From 1699daaf7f4fe38ac0395cc0a94d3a3c2de1c597 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 08:32:28 +0900
Subject: [PATCH 72/94] Make DrawableRank safer.

---
 .../Select/Leaderboards/DrawableRank.cs       | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs b/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
index 0d9d0cf451..5bfe3d6be0 100644
--- a/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Screens/Select/Leaderboards/DrawableRank.cs
@@ -14,30 +14,18 @@ namespace osu.Game.Screens.Select.Leaderboards
     public class DrawableRank : Container
     {
         private Sprite sprite;
-        private TextureStore textures;
 
-        private ScoreRank rank;
-        public ScoreRank Rank
-        {
-            get { return rank; }
-            set
-            {
-                if (value == rank) return;
-                rank = value;
-                sprite.Texture = textures.Get($@"Badges/ScoreRanks/{rank.GetDescription()}");
-            }
-        }
+        public ScoreRank Rank { get; private set; }
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore ts)
+        private void load(TextureStore textures)
         {
-            textures = ts;
-            sprite.Texture = textures.Get($@"Badges/ScoreRanks/{rank.GetDescription()}");
+            sprite.Texture = textures.Get($@"Badges/ScoreRanks/{Rank.GetDescription()}");
         }
 
         public DrawableRank(ScoreRank rank)
         {
-            this.rank = rank;
+            Rank = rank;
 
             Children = new Drawable[]
             {

From b46ded77945cfb9484cb2f797e070b10d8728ca9 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 22 Mar 2017 07:49:21 +0800
Subject: [PATCH 73/94] Use Bindable for DropDown.

---
 osu.Game/Overlays/Options/OptionDropDown.cs | 36 ++-------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Overlays/Options/OptionDropDown.cs b/osu.Game/Overlays/Options/OptionDropDown.cs
index 690d3d21a5..9c9cd17b12 100644
--- a/osu.Game/Overlays/Options/OptionDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionDropDown.cs
@@ -1,7 +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 System;
+using System.Collections.Generic;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using System.Collections.Generic;
 
 namespace osu.Game.Overlays.Options
 {
@@ -33,12 +32,8 @@ namespace osu.Game.Overlays.Options
             get { return bindable; }
             set
             {
-                if (bindable != null)
-                    bindable.ValueChanged -= bindable_ValueChanged;
                 bindable = value;
-                bindable.ValueChanged += bindable_ValueChanged;
-                bindable_ValueChanged(null, null);
-
+                dropdown.SelectedValue.BindTo(bindable);
                 if (bindable.Disabled)
                     Alpha = 0.3f;
             }
@@ -46,23 +41,6 @@ namespace osu.Game.Overlays.Options
 
         private Bindable<T> bindable;
 
-        private void bindable_ValueChanged(object sender, EventArgs e)
-        {
-            dropdown.SelectedValue = bindable.Value;
-        }
-
-        private void dropdown_ValueChanged(object sender, EventArgs e)
-        {
-            bindable.Value = dropdown.SelectedValue;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            bindable.ValueChanged -= bindable_ValueChanged;
-            dropdown.ValueChanged -= dropdown_ValueChanged;
-            base.Dispose(isDisposing);
-        }
-
         private IEnumerable<KeyValuePair<string, T>> items;
         public IEnumerable<KeyValuePair<string, T>> Items
         {
@@ -73,15 +51,8 @@ namespace osu.Game.Overlays.Options
             set
             {
                 items = value;
-                if(dropdown != null)
-                {
+                if (dropdown != null)
                     dropdown.Items = value;
-
-                    // We need to refresh the dropdown because our items changed,
-                    // thus its selected value may be outdated.
-                    if (bindable != null)
-                        dropdown.SelectedValue = bindable.Value;
-                }
             }
         }
 
@@ -104,7 +75,6 @@ namespace osu.Game.Overlays.Options
                     Items = Items,
                 }
             };
-            dropdown.ValueChanged += dropdown_ValueChanged;
         }
     }
 }

From 7387dbd9fcaa52f8e173c6a50d6a07b2c52a67f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 09:04:33 +0900
Subject: [PATCH 74/94] Tidy up LeaderboardScore

---
 .../Select/Leaderboards/LeaderboardScore.cs      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index c046d3a2f8..d1a48d7867 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -21,6 +21,10 @@ namespace osu.Game.Screens.Select.Leaderboards
     public class LeaderboardScore : Container, IStateful<Visibility>
     {
         public static readonly float HEIGHT = 60;
+
+        public readonly int RankPosition;
+        public readonly Score Score;
+
         private const float corner_radius = 5;
         private const float edge_margin = 5;
         private const float background_alpha = 0.25f;
@@ -35,9 +39,6 @@ namespace osu.Game.Screens.Select.Leaderboards
         private Container flagBadgeContainer;
         private FillFlowContainer<ScoreModIcon> modsContainer;
 
-        public readonly int Rank;
-        public readonly Score Score;
-
         private Visibility state;
         public Visibility State
         {
@@ -49,10 +50,8 @@ namespace osu.Game.Screens.Select.Leaderboards
                 switch (state)
                 {
                     case Visibility.Hidden:
-                        foreach (Drawable d in new Drawable[] { avatar, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer, })
-                        {
+                        foreach (var d in new Drawable[] { avatar, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer })
                             d.FadeOut();
-                        }
 
                         Alpha = 0;
 
@@ -60,7 +59,6 @@ namespace osu.Game.Screens.Select.Leaderboards
                         avatar.MoveToX(75);
                         nameLabel.MoveToX(150);
                         break;
-
                     case Visibility.Visible:
                         FadeIn(200);
                         content.MoveToY(0, 800, EasingTypes.OutQuint);
@@ -92,7 +90,7 @@ namespace osu.Game.Screens.Select.Leaderboards
         public LeaderboardScore(Score score, int rank)
         {
             Score = score;
-            Rank = rank;
+            RankPosition = rank;
 
             RelativeSizeAxes = Axes.X;
             Height = HEIGHT;
@@ -111,7 +109,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                             Origin = Anchor.CentreLeft,
                             Font = @"Exo2.0-MediumItalic",
                             TextSize = 22,
-                            Text = Rank.ToString(),
+                            Text = RankPosition.ToString(),
                         },
                     },
                 },

From f3486b728809cf0438a1ac06f6ffeb9a8f7d68b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 09:07:02 +0900
Subject: [PATCH 75/94] Add correct lifetime expiry for leaderboard content

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index db928a8aff..20e6db6241 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -27,11 +27,15 @@ namespace osu.Game.Screens.Select.Leaderboards
             {
                 scores = value;
 
-                int i = 0;
+                int i = 150;
                 if (scores == null)
                 {
                     foreach (var c in scrollFlow.Children)
-                        c.FadeOut(150 + i++ * 10);
+                        c.FadeOut(i += 10);
+
+                    foreach (var c in scrollFlow.Children)
+                        c.LifetimeEnd = Time.Current + i;
+
                     return;
                 }
 

From b06eb0122c8860fa480081cde2849d162a3e3272 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 22 Mar 2017 07:55:47 +0800
Subject: [PATCH 76/94] Fix for colours and members rename.

---
 osu.Game/Graphics/UserInterface/OsuDropDown.cs   | 2 +-
 osu.Game/Graphics/UserInterface/OsuMenu.cs       | 2 +-
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropDown.cs b/osu.Game/Graphics/UserInterface/OsuDropDown.cs
index 51fb335698..a921be1a1d 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropDown.cs
@@ -35,6 +35,6 @@ namespace osu.Game.Graphics.UserInterface
                 AccentColour = colours.PinkDarker;
         }
 
-        protected override DropDownMenuItem<T> CreateMenuItem(string key, T value) => new OsuDropDownMenuItem<T>(key, value) { AccentColour = AccentColour };
+        protected override DropDownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropDownMenuItem<T>(text, value) { AccentColour = AccentColour };
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs
index 4e80e1502a..95df3be9bf 100644
--- a/osu.Game/Graphics/UserInterface/OsuMenu.cs
+++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
         public OsuMenu()
         {
             CornerRadius = 4;
-            ContentBackground.Colour = Color4.Black.Opacity(0.5f);
+            Background.Colour = Color4.Black.Opacity(0.5f);
 
             ItemsContainer.Padding = new MarginPadding(5);
         }
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 947b39f621..84f3125ca4 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        protected override DropDown<T> CreateDropDownMenu() => new OsuTabDropDown();
+        protected override DropDown<T> CreateDropDown() => new OsuTabDropDown();
 
         protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
 
@@ -62,9 +62,9 @@ namespace osu.Game.Graphics.UserInterface
                 Origin = Anchor.TopRight,
             };
 
-            protected override DropDownMenuItem<T> CreateMenuItem(string key, T value)
+            protected override DropDownMenuItem<T> CreateMenuItem(string text, T value)
             {
-                var item = base.CreateMenuItem(key, value);
+                var item = base.CreateMenuItem(text, value);
                 item.ForegroundColourHover = Color4.Black;
                 return item;
             }
@@ -76,7 +76,7 @@ namespace osu.Game.Graphics.UserInterface
 
                 RelativeSizeAxes = Axes.X;
 
-                DropDownMenu.Colour = Color4.Black.Opacity(0.7f);
+                DropDownMenu.Background.Colour = Color4.Black.Opacity(0.7f);
                 DropDownMenu.MaxHeight = 400;
             }
 

From bee7b43a373775f690f0f5ddc119bbbcee156cd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 09:20:37 +0900
Subject: [PATCH 77/94] Make avatar fallback work on failed load.

---
 osu.Game/Users/Avatar.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Users/Avatar.cs b/osu.Game/Users/Avatar.cs
index efdd09d5bc..a6ce9f1e41 100644
--- a/osu.Game/Users/Avatar.cs
+++ b/osu.Game/Users/Avatar.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Users
         {
             if (loadTask != null || Sprite != null) return;
 
-            var newSprite = userId > 1 ? new OnlineSprite($@"https://a.ppy.sh/{userId}") : new Sprite { Texture = guestTexture };
+            var newSprite = userId > 1 ? new OnlineSprite($@"https://a.ppy.sh/{userId}", guestTexture) : new Sprite { Texture = guestTexture };
 
             newSprite.FillMode = FillMode.Fill;
 
@@ -95,17 +95,19 @@ namespace osu.Game.Users
         public class OnlineSprite : Sprite
         {
             private readonly string url;
+            private readonly Texture fallbackTexture;
 
-            public OnlineSprite(string url)
+            public OnlineSprite(string url, Texture fallbackTexture = null)
             {
                 Debug.Assert(url != null);
                 this.url = url;
+                this.fallbackTexture = fallbackTexture;
             }
 
             [BackgroundDependencyLoader]
             private void load(TextureStore textures)
             {
-                Texture = textures.Get(url);
+                Texture = textures.Get(url) ?? fallbackTexture;
             }
         }
     }

From 4f3ab879de5385fbc00705d414726095fcb7c56d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 09:43:44 +0900
Subject: [PATCH 78/94] Make DrawableHitObject's UpdateState safer by blocking
 calls at a higher level with not yet loaded.

UpdateState is called in LoadComplete for cases where the state may have changed before a load operation.
---
 osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs    | 2 --
 osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs | 2 --
 osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs       | 2 --
 osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs   | 2 --
 osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs      | 2 --
 osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs        | 3 +++
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
index 20bb937b76..e8c74d4f8d 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -111,8 +111,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
             ApproachCircle.FadeOut();
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 5e6249d66f..b2af678cae 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             Flush();
 
             UpdateInitialState();
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
index e9db97a67b..a2a52c7d94 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
@@ -158,8 +158,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
             ball.FadeIn();
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
index 0400d4a866..fff08b9f60 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -95,8 +95,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
             switch (state)
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
index 77bfb97ad4..8098e87b12 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -134,8 +134,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
             Delay(spinner.Duration, true);
diff --git a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
index 3ff30bd90e..6322614496 100644
--- a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
@@ -38,6 +38,9 @@ namespace osu.Game.Modes.Objects.Drawables
                     return;
                 state = value;
 
+                if (!IsLoaded)
+                    return;
+
                 UpdateState(state);
 
                 if (State == ArmedState.Hit)

From 7fba0c4bce787fe8a4e5eda5bb66ba565c158bbe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 15:44:23 +0900
Subject: [PATCH 79/94] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 405537bd35..24fc560d01 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 405537bd351954878ddc1d2ba53e5d0563528446
+Subproject commit 24fc560d01ba16d86a1c429817ec3b71d146e698

From cc2b4c5c5b4cf2c15687ea942c16334a733c91a7 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 05:54:07 -0400
Subject: [PATCH 80/94] Refactor WorkingBeatmap

Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
or so.
---
 .../Beatmaps/TestWorkingBeatmap.cs            |  32 +++++
 .../Tests/TestCaseGamefield.cs                |  13 +-
 .../Tests/TestCasePlayer.cs                   |  12 +-
 .../osu.Desktop.VisualTests.csproj            |   4 +
 osu.Game/Beatmaps/WorkingBeatmap.cs           | 124 ++---------------
 osu.Game/Database/BeatmapDatabase.cs          |  15 +--
 osu.Game/Database/DatabaseWorkingBeatmap.cs   | 127 ++++++++++++++++++
 osu.Game/osu.Game.csproj                      |   1 +
 8 files changed, 176 insertions(+), 152 deletions(-)
 create mode 100644 osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
 create mode 100644 osu.Game/Database/DatabaseWorkingBeatmap.cs

diff --git a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
new file mode 100644
index 0000000000..e6236b041f
--- /dev/null
+++ b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
@@ -0,0 +1,32 @@
+using System;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.IO;
+
+namespace osu.Desktop.VisualTests.Beatmaps
+{
+    public class TestWorkingBeatmap : WorkingBeatmap
+    {
+        public TestWorkingBeatmap(Beatmap beatmap)
+            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+        {
+            this.beatmap = beatmap;
+        }
+
+        private Beatmap beatmap;
+        public override Beatmap Beatmap => beatmap;
+        public override Texture Background => null;
+        public override Track Track => null;
+        
+        public override void Dispose()
+        {
+            // This space intentionally left blank
+        }
+        
+        public override void TransferTo(WorkingBeatmap other)
+        {
+            // This space intentionally left blank
+        }
+    }
+}
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index c2e33f7f32..6de2b36cd0 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -17,6 +17,8 @@ using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
 using System.Collections.Generic;
+using osu.Framework.Graphics.Textures;
+using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -95,16 +97,5 @@ namespace osu.Desktop.VisualTests.Tests
                 }
             });
         }
-
-        private class TestWorkingBeatmap : WorkingBeatmap
-        {
-            public TestWorkingBeatmap(Beatmap beatmap)
-                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-            {
-                Beatmap = beatmap;
-            }
-
-            protected override ArchiveReader GetReader() => null;
-        }
     }
 }
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index 41bd24b900..21a00ebdf6 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -15,6 +15,7 @@ using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Screens.Play;
 using OpenTK.Graphics;
+using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -97,16 +98,5 @@ namespace osu.Desktop.VisualTests.Tests
                 Beatmap = beatmap
             };
         }
-
-        private class TestWorkingBeatmap : WorkingBeatmap
-        {
-            public TestWorkingBeatmap(Beatmap beatmap)
-                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-            {
-                Beatmap = beatmap;
-            }
-
-            protected override ArchiveReader GetReader() => null;
-        }
     }
 }
diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index 6eb9e5e648..b67b4c4bb3 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -205,9 +205,13 @@
     <Compile Include="Tests\TestCaseDialogOverlay.cs" />
     <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />
     <Compile Include="Tests\TestCaseLeaderboard.cs" />
+    <Compile Include="Beatmaps\TestWorkingBeatmap.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Beatmaps\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\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/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 16db4fc2a6..3be2a40bb0 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -4,14 +4,11 @@
 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;
 using osu.Game.Modes.Mods;
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace osu.Game.Beatmaps
 {
@@ -27,131 +24,26 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public PlayMode? PreferredPlayMode;
 
-        public PlayMode PlayMode => beatmap?.BeatmapInfo?.Mode > PlayMode.Osu ? beatmap.BeatmapInfo.Mode : PreferredPlayMode ?? PlayMode.Osu;
+        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();
-
         protected WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
         {
             BeatmapInfo = beatmapInfo;
             BeatmapSetInfo = beatmapSetInfo;
             WithStoryboard = withStoryboard;
         }
+        
+        public abstract Beatmap Beatmap { get; }
+        public abstract Texture Background { get; }
+        public abstract Track Track { get; }
 
-        private Texture background;
-        private object backgroundLock = new object();
-        public Texture Background
-        {
-            get
-            {
-                lock (backgroundLock)
-                {
-                    if (background != null) return background;
+        public abstract void TransferTo(WorkingBeatmap other);
+        public abstract void Dispose();
 
-                    if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
-
-                    try
-                    {
-                        using (var reader = GetReader())
-                            background = new TextureStore(new RawTextureLoaderStore(reader), false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                    }
-                    catch { }
-
-                    return background;
-                }
-            }
-            set { lock (backgroundLock) background = value; }
-        }
-
-        private Beatmap beatmap;
-        private object beatmapLock = new object();
-        public Beatmap Beatmap
-        {
-            get
-            {
-                lock (beatmapLock)
-                {
-                    if (beatmap != null) return beatmap;
-
-                    try
-                    {
-                        using (var reader = GetReader())
-                        {
-                            BeatmapDecoder decoder;
-                            using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
-                            {
-                                decoder = BeatmapDecoder.GetDecoder(stream);
-                                beatmap = decoder?.Decode(stream);
-                            }
-
-                            if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
-                                using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                    decoder?.Decode(stream, beatmap);
-                        }
-                    }
-                    catch { }
-
-                    return beatmap;
-                }
-            }
-            set { lock (beatmapLock) beatmap = value; }
-        }
-
-        private ArchiveReader trackReader;
-        private Track track;
-        private object trackLock = new object();
-        public Track Track
-        {
-            get
-            {
-                lock (trackLock)
-                {
-                    if (track != null) return track;
-
-                    try
-                    {
-                        //store a reference to the reader as we may continue accessing the stream in the background.
-                        trackReader = GetReader();
-                        var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                        if (trackData != null)
-                            track = new TrackBass(trackData);
-                    }
-                    catch { }
-
-                    return track;
-                }
-            }
-            set { lock (trackLock) track = value; }
-        }
-
-        public bool TrackLoaded => track != null;
-
-        private bool isDisposed;
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!isDisposed)
-            {
-                track?.Dispose();
-                background?.Dispose();
-                isDisposed = true;
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public void TransferTo(WorkingBeatmap working)
-        {
-            if (track != null && BeatmapInfo.AudioEquals(working.BeatmapInfo))
-                working.track = track;
-        }
+        public virtual bool TrackLoaded => Track != null;
     }
 }
diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index 3f865d65f1..b115b86547 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -18,7 +18,7 @@ using SQLiteNetExtensions.Extensions;
 
 namespace osu.Game.Database
 {
-    public class BeatmapDatabase
+    public partial class BeatmapDatabase
     {
         private SQLiteConnection connection { get; }
         private Storage storage;
@@ -342,18 +342,5 @@ namespace osu.Game.Database
         }
 
         public bool Exists(BeatmapSetInfo beatmapSet) => storage.Exists(beatmapSet.Path);
-
-        private class DatabaseWorkingBeatmap : WorkingBeatmap
-        {
-            private readonly BeatmapDatabase database;
-
-            public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
-                : base(beatmapInfo, beatmapSetInfo, withStoryboard)
-            {
-                this.database = database;
-            }
-
-            protected override ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
-        }
     }
 }
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
new file mode 100644
index 0000000000..1584b9137b
--- /dev/null
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -0,0 +1,127 @@
+using System.IO;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.Beatmaps.IO;
+
+namespace osu.Game.Database
+{
+    public partial class BeatmapDatabase
+    {
+        private class DatabaseWorkingBeatmap : WorkingBeatmap
+        {
+            private readonly BeatmapDatabase database;
+
+            public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
+                : base(beatmapInfo, beatmapSetInfo, withStoryboard)
+            {
+                this.database = database;
+            }
+
+            private ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
+
+            private Beatmap beatmap;
+            private object beatmapLock = new object();
+            public override Beatmap Beatmap
+            {
+                get
+                {
+                    lock (beatmapLock)
+                    {
+                        if (beatmap != null) return beatmap;
+    
+                        try
+                        {
+                            using (var reader = GetReader())
+                            {
+                                BeatmapDecoder decoder;
+                                using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
+                                {
+                                    decoder = BeatmapDecoder.GetDecoder(stream);
+                                    beatmap = decoder?.Decode(stream);
+                                }
+    
+                                if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
+                                    using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
+                                        decoder?.Decode(stream, beatmap);
+                            }
+                        }
+                        catch { return null; }
+    
+                        return beatmap;
+                    }
+                }
+            }
+
+            private object backgroundLock = new object();
+            private Texture background;
+            public override Texture Background
+            {
+                get
+                {
+                    lock (backgroundLock)
+                    {
+                        if (background != null) return background;
+    
+                        if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
+    
+                        try
+                        {
+                            using (var reader = GetReader())
+                            {
+                                background = new TextureStore(
+                                    new RawTextureLoaderStore(reader),
+                                    false).Get(BeatmapInfo.Metadata.BackgroundFile);
+                            }
+                        }
+                        catch { return null; }
+    
+                        return background;
+                    }
+                }
+            }
+
+            private ArchiveReader trackReader;
+            private Track track;
+            private object trackLock = new object();
+            public override Track Track
+            {
+                get
+                {
+                    lock (trackLock)
+                    {
+                        if (track != null) return track;
+    
+                        try
+                        {
+                            //store a reference to the reader as we may continue accessing the stream in the background.
+                            trackReader = GetReader();
+                            var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                            if (trackData != null)
+                                track = new TrackBass(trackData);
+                        }
+                        catch { return null; }
+    
+                        return track;
+                    }
+                }
+            }
+            
+            public override bool TrackLoaded => track != null;
+
+            public override void TransferTo(WorkingBeatmap other)
+            {
+                var _other = (DatabaseWorkingBeatmap)other;
+                if (track != null && BeatmapInfo.AudioEquals(_other.BeatmapInfo))
+                    _other.track = track;
+            }
+            
+            public override void Dispose()
+            {
+                background?.Dispose();
+                background = null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9cedaa1b09..5b31962f21 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -363,6 +363,7 @@
     <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
     <Compile Include="Graphics\UserInterface\OsuTabControl.cs" />
     <Compile Include="Graphics\UserInterface\OsuTabItem.cs" />
+    <Compile Include="Database\DatabaseWorkingBeatmap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">

From 267238dc270cbc01b47545f34e594fe728e59471 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 06:15:32 -0400
Subject: [PATCH 81/94] Simplify derived classes of WorkingBeatmap

---
 .../Beatmaps/TestWorkingBeatmap.cs            |  46 +++----
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  62 ++++++++-
 osu.Game/Database/DatabaseWorkingBeatmap.cs   | 123 ++++++------------
 3 files changed, 116 insertions(+), 115 deletions(-)

diff --git a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
index e6236b041f..0db9991cb8 100644
--- a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
@@ -1,32 +1,26 @@
-using System;
+// 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.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.IO;
 
-namespace osu.Desktop.VisualTests.Beatmaps
-{
-    public class TestWorkingBeatmap : WorkingBeatmap
-    {
-        public TestWorkingBeatmap(Beatmap beatmap)
-            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-        {
-            this.beatmap = beatmap;
+namespace osu.Desktop.VisualTests.Beatmaps
+{
+    public class TestWorkingBeatmap : WorkingBeatmap
+    {
+        public TestWorkingBeatmap(Beatmap beatmap)
+            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+        {
+            this.beatmap = beatmap;
         }
-
-        private Beatmap beatmap;
-        public override Beatmap Beatmap => beatmap;
-        public override Texture Background => null;
-        public override Track Track => null;
-        
-        public override void Dispose()
-        {
-            // This space intentionally left blank
-        }
-        
-        public override void TransferTo(WorkingBeatmap other)
-        {
-            // This space intentionally left blank
-        }
-    }
-}
+
+        private Beatmap beatmap;
+        
+        protected override Beatmap GetBeatmap() => beatmap;
+        protected override Texture GetBackground() => null;
+        protected override Track GetTrack() => null;
+    }
+}
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 3be2a40bb0..2a2de1b6ef 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -36,14 +36,64 @@ namespace osu.Game.Beatmaps
             BeatmapSetInfo = beatmapSetInfo;
             WithStoryboard = withStoryboard;
         }
+
+        protected abstract Beatmap GetBeatmap();
+        protected abstract Texture GetBackground();
+        protected abstract Track GetTrack();
         
-        public abstract Beatmap Beatmap { get; }
-        public abstract Texture Background { get; }
-        public abstract Track Track { get; }
+        private Beatmap beatmap;
+        private object beatmapLock = new object();
+        public Beatmap Beatmap
+        {
+            get
+            {
+                lock (beatmapLock)
+                {
+                    return beatmap ?? (beatmap = GetBeatmap());
+                }
+            }
+        }
+        
+        private object backgroundLock = new object();
+        private Texture background;
+        public Texture Background
+        {
+            get
+            {
+                lock (backgroundLock)
+                {
+                    return background ?? (background = GetBackground());
+                }
+            }
+        }
 
-        public abstract void TransferTo(WorkingBeatmap other);
-        public abstract void Dispose();
+        private Track track;
+        private object trackLock = new object();
+        public Track Track
+        {
+            get
+            {
+                lock (trackLock)
+                {
+                    return track ?? (track = GetTrack());
+                }
+            }
+        }
 
-        public virtual bool TrackLoaded => Track != null;
+        public bool TrackLoaded => track != null;
+
+        public void TransferTo(WorkingBeatmap other)
+        {
+            if (track != null && BeatmapInfo.AudioEquals(other.BeatmapInfo))
+                other.track = track;
+        }
+        
+        public virtual void Dispose()
+        {
+            track?.Dispose();
+            track = null;
+            background?.Dispose();
+            background = null;
+        }
     }
 }
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 1584b9137b..56b4a81980 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -1,4 +1,7 @@
-using System.IO;
+// 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.IO;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
@@ -20,107 +23,61 @@ namespace osu.Game.Database
             }
 
             private ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
-
-            private Beatmap beatmap;
-            private object beatmapLock = new object();
-            public override Beatmap Beatmap
+            
+            protected override Beatmap GetBeatmap()
             {
-                get
+                Beatmap beatmap;
+                try
                 {
-                    lock (beatmapLock)
+                    using (var reader = GetReader())
                     {
-                        if (beatmap != null) return beatmap;
-    
-                        try
+                        BeatmapDecoder decoder;
+                        using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
                         {
-                            using (var reader = GetReader())
-                            {
-                                BeatmapDecoder decoder;
-                                using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
-                                {
-                                    decoder = BeatmapDecoder.GetDecoder(stream);
-                                    beatmap = decoder?.Decode(stream);
-                                }
-    
-                                if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
-                                    using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                        decoder?.Decode(stream, beatmap);
-                            }
+                            decoder = BeatmapDecoder.GetDecoder(stream);
+                            beatmap = decoder?.Decode(stream);
                         }
-                        catch { return null; }
-    
-                        return beatmap;
+
+                        if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
+                            using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
+                                decoder?.Decode(stream, beatmap);
                     }
                 }
+                catch { return null; }
+                return beatmap;
             }
-
-            private object backgroundLock = new object();
-            private Texture background;
-            public override Texture Background
+            
+            protected override Texture GetBackground()
             {
-                get
+                Texture background;
+                if (BeatmapInfo?.Metadata?.BackgroundFile == null)
+                    return null;
+                try
                 {
-                    lock (backgroundLock)
+                    using (var reader = GetReader())
                     {
-                        if (background != null) return background;
-    
-                        if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
-    
-                        try
-                        {
-                            using (var reader = GetReader())
-                            {
-                                background = new TextureStore(
-                                    new RawTextureLoaderStore(reader),
-                                    false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                            }
-                        }
-                        catch { return null; }
-    
-                        return background;
+                        background = new TextureStore(
+                            new RawTextureLoaderStore(reader),
+                            false).Get(BeatmapInfo.Metadata.BackgroundFile);
                     }
                 }
+                catch { return null; }
+                return background;
             }
 
             private ArchiveReader trackReader;
-            private Track track;
-            private object trackLock = new object();
-            public override Track Track
+            protected override Track GetTrack()
             {
-                get
+                Track track;
+                try
                 {
-                    lock (trackLock)
-                    {
-                        if (track != null) return track;
-    
-                        try
-                        {
-                            //store a reference to the reader as we may continue accessing the stream in the background.
-                            trackReader = GetReader();
-                            var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                            if (trackData != null)
-                                track = new TrackBass(trackData);
-                        }
-                        catch { return null; }
-    
-                        return track;
-                    }
+                    //store a reference to the reader as we may continue accessing the stream in the background.
+                    trackReader = GetReader();
+                    var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                    track = trackData == null ? null : new TrackBass(trackData);
                 }
-            }
-            
-            public override bool TrackLoaded => track != null;
-
-            public override void TransferTo(WorkingBeatmap other)
-            {
-                var _other = (DatabaseWorkingBeatmap)other;
-                if (track != null && BeatmapInfo.AudioEquals(_other.BeatmapInfo))
-                    _other.track = track;
-            }
-            
-            public override void Dispose()
-            {
-                background?.Dispose();
-                background = null;
+                catch { return null; }
+                return track;
             }
         }
     }

From 2b1d31e69c222afd25335dcd27b86fec050e6de0 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 06:25:49 -0400
Subject: [PATCH 82/94] Address linting issues

---
 osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs |  2 --
 osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs     |  2 --
 osu.Desktop.VisualTests/Tests/TestCasePlayer.cs        |  2 --
 osu.Game/Database/DatabaseWorkingBeatmap.cs            | 10 +++++-----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
index 0db9991cb8..babca8ee06 100644
--- a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
@@ -1,11 +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 osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.IO;
 
 namespace osu.Desktop.VisualTests.Beatmaps
 {
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index 6de2b36cd0..e876c21a12 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -8,7 +8,6 @@ using osu.Framework.MathUtils;
 using osu.Framework.Screens.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes.Catch.UI;
 using osu.Game.Modes.Mania.UI;
@@ -17,7 +16,6 @@ using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
 using System.Collections.Generic;
-using osu.Framework.Graphics.Textures;
 using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index 21a00ebdf6..a08cb3e97e 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Screens.Testing;
 using osu.Game.Beatmaps;
 using OpenTK;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Modes.Objects;
@@ -24,7 +23,6 @@ namespace osu.Desktop.VisualTests.Tests
         protected Player Player;
         private BeatmapDatabase db;
 
-
         public override string Description => @"Showing everything to play the game.";
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 56b4a81980..0961d95f03 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -22,14 +22,14 @@ namespace osu.Game.Database
                 this.database = database;
             }
 
-            private ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
+            private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
             
             protected override Beatmap GetBeatmap()
             {
                 Beatmap beatmap;
                 try
                 {
-                    using (var reader = GetReader())
+                    using (var reader = getReader())
                     {
                         BeatmapDecoder decoder;
                         using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
@@ -40,7 +40,7 @@ namespace osu.Game.Database
 
                         if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
                             using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                decoder?.Decode(stream, beatmap);
+                                decoder.Decode(stream, beatmap);
                     }
                 }
                 catch { return null; }
@@ -54,7 +54,7 @@ namespace osu.Game.Database
                     return null;
                 try
                 {
-                    using (var reader = GetReader())
+                    using (var reader = getReader())
                     {
                         background = new TextureStore(
                             new RawTextureLoaderStore(reader),
@@ -72,7 +72,7 @@ namespace osu.Game.Database
                 try
                 {
                     //store a reference to the reader as we may continue accessing the stream in the background.
-                    trackReader = GetReader();
+                    trackReader = getReader();
                     var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
                     track = trackData == null ? null : new TrackBass(trackData);
                 }

From fbe08436d2dbe9aac1639d9037e08ac7eec7e57b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 15:27:22 +0900
Subject: [PATCH 83/94] Fix usages of CircularContainer in line with framework
 changes.

---
 osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs | 2 ++
 osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs | 1 +
 osu.Game/Graphics/UserInterface/Nub.cs                     | 2 ++
 osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs      | 2 ++
 osu.Game/Overlays/Dialog/PopupDialog.cs                    | 1 +
 osu.Game/Screens/Menu/OsuLogo.cs                           | 2 ++
 6 files changed, 10 insertions(+)

diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
index 8d8aadbb60..750f203a8d 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             {
                 new CircularContainer
                 {
+                    Masking = true,
+                    Origin = Anchor.Centre,
                     EdgeEffect = new EdgeEffect
                     {
                         Type = EdgeEffectType.Glow,
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 906a3cd7c3..58745dec84 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -61,6 +61,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                     {
                         Colour = Color4.White,
                         RelativePositionAxes = Axes.Both,
+                        Masking = true,
                         Origin = Anchor.Centre,
                         Size = new Vector2(1 / ScreenSpaceDrawQuad.Width * 2000),
                         Children = new[]
diff --git a/osu.Game/Graphics/UserInterface/Nub.cs b/osu.Game/Graphics/UserInterface/Nub.cs
index 6f3529b67d..a32e047af9 100644
--- a/osu.Game/Graphics/UserInterface/Nub.cs
+++ b/osu.Game/Graphics/UserInterface/Nub.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Graphics.UserInterface
             BorderColour = Color4.White;
             BorderThickness = border_width;
 
+            Masking = true;
+
             Children = new[]
             {
                 fill = new Box
diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index df48694249..c9d8f936f6 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Graphics.UserInterface
                     circle = new CircularContainer
                     {
                         Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Masking = true,
                         Alpha = 0,
                         RelativeSizeAxes = Axes.Both,
                         Size = new Vector2(0.8f, 0),
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 908dbf8ebc..7936339e0c 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -193,6 +193,7 @@ namespace osu.Game.Overlays.Dialog
                                         {
                                             Origin = Anchor.Centre,
                                             Anchor = Anchor.Centre,
+                                            Masking = true,
                                             BorderColour = Color4.White,
                                             BorderThickness = 5f,
                                             Children = new Drawable[]
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 259e98c483..90223616d0 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -91,8 +91,10 @@ namespace osu.Game.Screens.Menu
                                         logoContainer = new CircularContainer
                                         {
                                             Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
                                             RelativeSizeAxes = Axes.Both,
                                             Scale = new Vector2(0.8f),
+                                            Masking = true,
                                             Children = new Drawable[]
                                             {
                                                 colourAndTriangles = new Container

From 2e1f596b2ad0974665c0f53301cf3a2540097ec5 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 06:50:48 -0400
Subject: [PATCH 84/94] Move DatabaseWorkingBeatmap out of partial class

---
 osu.Game/Database/BeatmapDatabase.cs        |   2 +-
 osu.Game/Database/DatabaseWorkingBeatmap.cs | 115 ++++++++++----------
 2 files changed, 57 insertions(+), 60 deletions(-)

diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index b115b86547..317467d792 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -18,7 +18,7 @@ using SQLiteNetExtensions.Extensions;
 
 namespace osu.Game.Database
 {
-    public partial class BeatmapDatabase
+    public class BeatmapDatabase
     {
         private SQLiteConnection connection { get; }
         private Storage storage;
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 0961d95f03..0a7779f17b 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -10,75 +10,72 @@ using osu.Game.Beatmaps.IO;
 
 namespace osu.Game.Database
 {
-    public partial class BeatmapDatabase
+    internal class DatabaseWorkingBeatmap : WorkingBeatmap
     {
-        private class DatabaseWorkingBeatmap : WorkingBeatmap
+        private readonly BeatmapDatabase database;
+
+        public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
+            : base(beatmapInfo, beatmapSetInfo, withStoryboard)
         {
-            private readonly BeatmapDatabase database;
+            this.database = database;
+        }
 
-            public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
-                : base(beatmapInfo, beatmapSetInfo, withStoryboard)
+        private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
+        
+        protected override Beatmap GetBeatmap()
+        {
+            Beatmap beatmap;
+            try
             {
-                this.database = database;
-            }
-
-            private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
-            
-            protected override Beatmap GetBeatmap()
-            {
-                Beatmap beatmap;
-                try
+                using (var reader = getReader())
                 {
-                    using (var reader = getReader())
+                    BeatmapDecoder decoder;
+                    using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
                     {
-                        BeatmapDecoder decoder;
-                        using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
-                        {
-                            decoder = BeatmapDecoder.GetDecoder(stream);
-                            beatmap = decoder?.Decode(stream);
-                        }
-
-                        if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
-                            using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                decoder.Decode(stream, beatmap);
+                        decoder = BeatmapDecoder.GetDecoder(stream);
+                        beatmap = decoder?.Decode(stream);
                     }
-                }
-                catch { return null; }
-                return beatmap;
-            }
-            
-            protected override Texture GetBackground()
-            {
-                Texture background;
-                if (BeatmapInfo?.Metadata?.BackgroundFile == null)
-                    return null;
-                try
-                {
-                    using (var reader = getReader())
-                    {
-                        background = new TextureStore(
-                            new RawTextureLoaderStore(reader),
-                            false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                    }
-                }
-                catch { return null; }
-                return background;
-            }
 
-            private ArchiveReader trackReader;
-            protected override Track GetTrack()
-            {
-                Track track;
-                try
-                {
-                    //store a reference to the reader as we may continue accessing the stream in the background.
-                    trackReader = getReader();
-                    var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                    track = trackData == null ? null : new TrackBass(trackData);
+                    if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
+                        using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
+                            decoder.Decode(stream, beatmap);
                 }
-                catch { return null; }
-                return track;
             }
+            catch { return null; }
+            return beatmap;
+        }
+        
+        protected override Texture GetBackground()
+        {
+            Texture background;
+            if (BeatmapInfo?.Metadata?.BackgroundFile == null)
+                return null;
+            try
+            {
+                using (var reader = getReader())
+                {
+                    background = new TextureStore(
+                        new RawTextureLoaderStore(reader),
+                        false).Get(BeatmapInfo.Metadata.BackgroundFile);
+                }
+            }
+            catch { return null; }
+            return background;
+        }
+
+        private ArchiveReader trackReader;
+        protected override Track GetTrack()
+        {
+            Track track;
+            try
+            {
+                //store a reference to the reader as we may continue accessing the stream in the background.
+                trackReader = getReader();
+                var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                track = trackData == null ? null : new TrackBass(trackData);
+            }
+            catch { return null; }
+            return track;
         }
     }
 }
\ No newline at end of file

From 1c83442b0b1cc7ea8fe0315567f8f7d2e9989536 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 21:36:03 +0900
Subject: [PATCH 85/94] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 24fc560d01..31cf1c4b58 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 24fc560d01ba16d86a1c429817ec3b71d146e698
+Subproject commit 31cf1c4b58c866d047876b15a95a4cf0115d3105

From 086191a12a8cc15a248d566bc7b8023e2d41924e Mon Sep 17 00:00:00 2001
From: Andrey Zavadskiy <megaman9919@gmail.com>
Date: Wed, 22 Mar 2017 16:13:39 +0300
Subject: [PATCH 86/94] Spinner fix

---
 osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 58745dec84..a4fce3deb5 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         private void load(OsuColour colours)
         {
             completeColour = colours.YellowLight.Opacity(0.8f);
+            Masking = true;
         }
 
         private class SpinnerBorder : Container

From 2d75c604636e97d5588e6a03dce592f4f1aa3723 Mon Sep 17 00:00:00 2001
From: Andrey Zavadskiy <megaman9919@gmail.com>
Date: Wed, 22 Mar 2017 17:21:24 +0300
Subject: [PATCH 87/94] Fix checkbox dependency in LoginOptions

---
 osu.Game/Configuration/OsuConfigManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 1442a26a06..6190678e1e 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -176,11 +176,11 @@ namespace osu.Game.Configuration
                 ConfineMouseMode.Fullscreen : ConfineMouseMode.Never).Disabled = true;
 
 
-            GetBindable<bool>(OsuConfig.SavePassword).ValueChanged += delegate
+            GetOriginalBindable<bool>(OsuConfig.SavePassword).ValueChanged += delegate
             {
                 if (Get<bool>(OsuConfig.SavePassword)) Set(OsuConfig.SaveUsername, true);
             };
-            GetBindable<bool>(OsuConfig.SaveUsername).ValueChanged += delegate
+            GetOriginalBindable<bool>(OsuConfig.SaveUsername).ValueChanged += delegate
             {
                 if (!Get<bool>(OsuConfig.SaveUsername)) Set(OsuConfig.SavePassword, false);
             };

From 0dbc232ebf96c8f425b90d4c445909a04df9b758 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 22 Mar 2017 22:32:32 +0800
Subject: [PATCH 88/94] Rename all DropDown -> Dropdown.

---
 .../{OsuDropDown.cs => OsuDropdown.cs}        | 10 +++----
 ...DropDownHeader.cs => OsuDropdownHeader.cs} |  4 +--
 ...DownMenuItem.cs => OsuDropdownMenuItem.cs} |  4 +--
 .../Graphics/UserInterface/OsuTabControl.cs   | 26 +++++++++----------
 .../{OptionDropDown.cs => OptionDropdown.cs}  |  8 +++---
 ...nEnumDropDown.cs => OptionEnumDropdown.cs} |  4 +--
 .../Sections/Audio/AudioDevicesOptions.cs     |  4 +--
 .../Options/Sections/Debug/GCOptions.cs       |  2 +-
 .../Sections/Gameplay/GeneralOptions.cs       |  4 +--
 .../Options/Sections/General/UpdateOptions.cs |  2 +-
 .../Sections/Graphics/DetailOptions.cs        |  2 +-
 .../Sections/Graphics/LayoutOptions.cs        |  2 +-
 .../Sections/Graphics/RendererOptions.cs      |  2 +-
 .../Options/Sections/Input/MouseOptions.cs    |  2 +-
 osu.Game/osu.Game.csproj                      |  6 ++---
 15 files changed, 41 insertions(+), 41 deletions(-)
 rename osu.Game/Graphics/UserInterface/{OsuDropDown.cs => OsuDropdown.cs} (67%)
 rename osu.Game/Graphics/UserInterface/{OsuDropDownHeader.cs => OsuDropdownHeader.cs} (92%)
 rename osu.Game/Graphics/UserInterface/{OsuDropDownMenuItem.cs => OsuDropdownMenuItem.cs} (92%)
 rename osu.Game/Overlays/Options/{OptionDropDown.cs => OptionDropdown.cs} (88%)
 rename osu.Game/Overlays/Options/{OptionEnumDropDown.cs => OptionEnumDropdown.cs} (89%)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropDown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
similarity index 67%
rename from osu.Game/Graphics/UserInterface/OsuDropDown.cs
rename to osu.Game/Graphics/UserInterface/OsuDropdown.cs
index a921be1a1d..d8d4a93091 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -8,9 +8,9 @@ using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class OsuDropDown<T> : DropDown<T>
+    public class OsuDropdown<T> : Dropdown<T>
     {
-        protected override DropDownHeader CreateHeader() => new OsuDropDownHeader { AccentColour = AccentColour };
+        protected override DropdownHeader CreateHeader() => new OsuDropdownHeader { AccentColour = AccentColour };
 
         protected override Menu CreateMenu() => new OsuMenu();
 
@@ -22,8 +22,8 @@ namespace osu.Game.Graphics.UserInterface
             {
                 accentColour = value;
                 if (Header != null)
-                    ((OsuDropDownHeader)Header).AccentColour = value;
-                foreach (var item in MenuItems.OfType<OsuDropDownMenuItem<T>>())
+                    ((OsuDropdownHeader)Header).AccentColour = value;
+                foreach (var item in MenuItems.OfType<OsuDropdownMenuItem<T>>())
                     item.AccentColour = value;
             }
         }
@@ -35,6 +35,6 @@ namespace osu.Game.Graphics.UserInterface
                 AccentColour = colours.PinkDarker;
         }
 
-        protected override DropDownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropDownMenuItem<T>(text, value) { AccentColour = AccentColour };
+        protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem<T>(text, value) { AccentColour = AccentColour };
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs b/osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
similarity index 92%
rename from osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs
rename to osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
index 559ffca283..8bef24a6f8 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
@@ -12,7 +12,7 @@ using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class OsuDropDownHeader : DropDownHeader
+    public class OsuDropdownHeader : DropdownHeader
     {
         private SpriteText label;
         protected override string Label
@@ -32,7 +32,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public OsuDropDownHeader()
+        public OsuDropdownHeader()
         {
             Foreground.Padding = new MarginPadding(4);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
similarity index 92%
rename from osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
rename to osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
index 71650dee52..bcd53a8dbd 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
@@ -12,9 +12,9 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class OsuDropDownMenuItem<U> : DropDownMenuItem<U>
+    public class OsuDropdownMenuItem<T> : DropdownMenuItem<T>
     {
-        public OsuDropDownMenuItem(string text, U value) : base(text, value)
+        public OsuDropdownMenuItem(string text, T value) : base(text, value)
         {
             Foreground.Padding = new MarginPadding(2);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 84f3125ca4..8a22347c76 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -16,11 +16,11 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        protected override DropDown<T> CreateDropDown() => new OsuTabDropDown();
+        protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown();
 
         protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || DropDown.Contains(screenSpacePos);
+        protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
 
         public OsuTabControl()
         {
@@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 accentColour = value;
-                var dropDown = DropDown as OsuTabDropDown;
+                var dropDown = Dropdown as OsuTabDropdown;
                 if (dropDown != null)
                     dropDown.AccentColour = value;
                 foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
@@ -53,34 +53,34 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public class OsuTabDropDown : OsuDropDown<T>
+        public class OsuTabDropdown : OsuDropdown<T>
         {
-            protected override DropDownHeader CreateHeader() => new OsuTabDropDownHeader
+            protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
             {
                 AccentColour = AccentColour,
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
             };
 
-            protected override DropDownMenuItem<T> CreateMenuItem(string text, T value)
+            protected override DropdownMenuItem<T> CreateMenuItem(string text, T value)
             {
                 var item = base.CreateMenuItem(text, value);
                 item.ForegroundColourHover = Color4.Black;
                 return item;
             }
 
-            public OsuTabDropDown()
+            public OsuTabDropdown()
             {
-                DropDownMenu.Anchor = Anchor.TopRight;
-                DropDownMenu.Origin = Anchor.TopRight;
+                DropdownMenu.Anchor = Anchor.TopRight;
+                DropdownMenu.Origin = Anchor.TopRight;
 
                 RelativeSizeAxes = Axes.X;
 
-                DropDownMenu.Background.Colour = Color4.Black.Opacity(0.7f);
-                DropDownMenu.MaxHeight = 400;
+                DropdownMenu.Background.Colour = Color4.Black.Opacity(0.7f);
+                DropdownMenu.MaxHeight = 400;
             }
 
-            public class OsuTabDropDownHeader : OsuDropDownHeader
+            public class OsuTabDropdownHeader : OsuDropdownHeader
             {
                 public override Color4 AccentColour
                 {
@@ -104,7 +104,7 @@ namespace osu.Game.Graphics.UserInterface
                     base.OnHoverLost(state);
                 }
 
-                public OsuTabDropDownHeader()
+                public OsuTabDropdownHeader()
                 {
                     RelativeSizeAxes = Axes.None;
                     AutoSizeAxes = Axes.X;
diff --git a/osu.Game/Overlays/Options/OptionDropDown.cs b/osu.Game/Overlays/Options/OptionDropdown.cs
similarity index 88%
rename from osu.Game/Overlays/Options/OptionDropDown.cs
rename to osu.Game/Overlays/Options/OptionDropdown.cs
index 9c9cd17b12..d46e786bca 100644
--- a/osu.Game/Overlays/Options/OptionDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionDropdown.cs
@@ -13,9 +13,9 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionDropDown<T> : FillFlowContainer
+    public class OptionDropdown<T> : FillFlowContainer
     {
-        private DropDown<T> dropdown;
+        private Dropdown<T> dropdown;
         private SpriteText text;
 
         public string LabelText
@@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Options
             }
         }
 
-        public OptionDropDown()
+        public OptionDropdown()
         {
             Items = new KeyValuePair<string, T>[0];
 
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays.Options
                 text = new OsuSpriteText {
                     Alpha = 0,
                 },
-                dropdown = new OsuDropDown<T>
+                dropdown = new OsuDropdown<T>
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Overlays/Options/OptionEnumDropDown.cs b/osu.Game/Overlays/Options/OptionEnumDropdown.cs
similarity index 89%
rename from osu.Game/Overlays/Options/OptionEnumDropDown.cs
rename to osu.Game/Overlays/Options/OptionEnumDropdown.cs
index 50d1d36b4c..1a4f4635e2 100644
--- a/osu.Game/Overlays/Options/OptionEnumDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionEnumDropdown.cs
@@ -8,9 +8,9 @@ using System.Collections.Generic;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionEnumDropDown<T> : OptionDropDown<T>
+    public class OptionEnumDropdown<T> : OptionDropdown<T>
     {
-        public OptionEnumDropDown()
+        public OptionEnumDropdown()
         {
             if (!typeof(T).IsEnum)
                 throw new InvalidOperationException("OptionsDropdown only supports enums as the generic type argument");
diff --git a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
index 25585845b0..2818f5fbd7 100644
--- a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Options.Sections.Audio
         protected override string Header => "Devices";
 
         private AudioManager audio;
-        private OptionDropDown<string> dropdown;
+        private OptionDropdown<string> dropdown;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
@@ -50,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 ada57e8dd0..4350625d51 100644
--- a/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Options.Sections.Debug
         {
             Children = new Drawable[]
             {
-                new OptionEnumDropDown<GCLatencyMode>
+                new OptionEnumDropdown<GCLatencyMode>
                 {
                     LabelText = "Active mode",
                     Bindable = config.GetBindable<GCLatencyMode>(FrameworkDebugConfig.ActiveGCMode)
diff --git a/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs b/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs
index 1c28f6247d..70a2c52322 100644
--- a/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs
@@ -23,12 +23,12 @@ namespace osu.Game.Overlays.Options.Sections.Gameplay
                     LabelText = "Background dim",
                     Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.DimLevel)
                 },
-                new OptionEnumDropDown<ProgressBarType>
+                new OptionEnumDropdown<ProgressBarType>
                 {
                     LabelText = "Progress display",
                     Bindable = config.GetBindable<ProgressBarType>(OsuConfig.ProgressBarType)
                 },
-                new OptionEnumDropDown<ScoreMeterType>
+                new OptionEnumDropdown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",
                     Bindable = config.GetBindable<ScoreMeterType>(OsuConfig.ScoreMeter)
diff --git a/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs b/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs
index c45dc9cbd4..2b2939e432 100644
--- a/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Options.Sections.General
         {
             Children = new Drawable[]
             {
-                new OptionEnumDropDown<ReleaseStream>
+                new OptionEnumDropdown<ReleaseStream>
                 {
                     LabelText = "Release stream",
                     Bindable = config.GetBindable<ReleaseStream>(OsuConfig.ReleaseStream),
diff --git a/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs
index e66d097094..0af8a4c580 100644
--- a/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
                     LabelText = "Softening filter",
                     Bindable = config.GetBindable<bool>(OsuConfig.BloomSoftening)
                 },
-                new OptionEnumDropDown<ScreenshotFormat>
+                new OptionEnumDropdown<ScreenshotFormat>
                 {
                     LabelText = "Screenshot",
                     Bindable = config.GetBindable<ScreenshotFormat>(OsuConfig.ScreenshotFormat)
diff --git a/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
index 0a2e8f91a4..8c4930d99d 100644
--- a/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
             Children = new Drawable[]
             {
                 new OptionLabel { Text = "Resolution: TODO dropdown" },
-                new OptionEnumDropDown<WindowMode>
+                new OptionEnumDropdown<WindowMode>
                 {
                     LabelText = "Screen mode",
                     Bindable = config.GetBindable<WindowMode>(FrameworkConfig.WindowMode),
diff --git a/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs
index b98337f1e6..c898879167 100644
--- a/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
             Children = new Drawable[]
             {
                 // TODO: this needs to be a custom dropdown at some point
-                new OptionEnumDropDown<FrameSync>
+                new OptionEnumDropdown<FrameSync>
                 {
                     LabelText = "Frame limiter",
                     Bindable = config.GetBindable<FrameSync>(FrameworkConfig.FrameSync)
diff --git a/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs b/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
index ef1dd755b7..92be00bdb0 100644
--- a/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Options.Sections.Input
                     LabelText = "Map absolute raw input to the osu! window",
                     Bindable = config.GetBindable<bool>(OsuConfig.AbsoluteToOsuWindow)
                 },
-                new OptionEnumDropDown<ConfineMouseMode>
+                new OptionEnumDropdown<ConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor",
                     Bindable = config.GetBindable<ConfineMouseMode>(OsuConfig.ConfineMouse),
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 39b9d8d9e5..879ca9ddbe 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -161,9 +161,9 @@
     <Compile Include="Overlays\Notifications\SimpleNotification.cs" />
     <Compile Include="Overlays\Options\OptionDropDown.cs" />
     <Compile Include="Overlays\Options\OptionLabel.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDownHeader.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDown.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDownMenuItem.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropdownHeader.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropdown.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" />

From 5043032b480f95ac4fbd4ead05873f050f1c8e69 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 22 Mar 2017 22:56:45 +0800
Subject: [PATCH 89/94] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 31cf1c4b58..42ec8a62fb 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 31cf1c4b58c866d047876b15a95a4cf0115d3105
+Subproject commit 42ec8a62fb697f1d967a927549dc51336cd66968

From 537f0b93407882e6417c4c801e0f9de1602e921e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 08:07:59 +0900
Subject: [PATCH 90/94] Fix menu cursor size not sticking on startup.

Also tidied up bindables.
---
 osu.Game/Graphics/Cursor/GameplayCursor.cs | 5 ++---
 osu.Game/Graphics/Cursor/MenuCursor.cs     | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/GameplayCursor.cs b/osu.Game/Graphics/Cursor/GameplayCursor.cs
index 42d7e83750..ed9d52d0b7 100644
--- a/osu.Game/Graphics/Cursor/GameplayCursor.cs
+++ b/osu.Game/Graphics/Cursor/GameplayCursor.cs
@@ -54,8 +54,6 @@ namespace osu.Game.Graphics.Cursor
             [BackgroundDependencyLoader]
             private void load(OsuConfigManager config)
             {
-                cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
-
                 Children = new Drawable[]
                 {
                     cursorContainer = new CircularContainer
@@ -63,7 +61,6 @@ namespace osu.Game.Graphics.Cursor
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,
-                        Scale = new Vector2((float)cursorScale),
                         Masking = true,
                         BorderThickness = Size.X / 6,
                         BorderColour = Color4.White,
@@ -119,7 +116,9 @@ namespace osu.Game.Graphics.Cursor
                     },
                 };
 
+                cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
                 cursorScale.ValueChanged += scaleChanged;
+                cursorScale.TriggerChange();
             }
 
             private void scaleChanged(object sender, EventArgs e)
diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 0f90a5aa0e..3ab6fa7093 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -97,8 +97,6 @@ namespace osu.Game.Graphics.Cursor
             [BackgroundDependencyLoader]
             private void load(OsuConfigManager config, TextureStore textures, OsuColour colour)
             {
-                cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
-
                 Children = new Drawable[]
                 {
                     cursorContainer = new Container
@@ -122,7 +120,10 @@ namespace osu.Game.Graphics.Cursor
                         }
                     }
                 };
+
+                cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
                 cursorScale.ValueChanged += scaleChanged;
+                cursorScale.TriggerChange();
             }
 
             private void scaleChanged(object sender, EventArgs e)

From ba32d50456e2299023b48c34209e53255aaecef1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 08:44:52 +0900
Subject: [PATCH 91/94] Consolidate nested classes.

---
 .../Graphics/UserInterface/OsuDropdown.cs     | 132 ++++++++++++++++++
 .../UserInterface/OsuDropdownHeader.cs        |  69 ---------
 .../UserInterface/OsuDropdownMenuItem.cs      |  85 -----------
 .../Graphics/UserInterface/OsuTabControl.cs   | 112 ++++++++++++++-
 osu.Game/Graphics/UserInterface/OsuTabItem.cs | 121 ----------------
 osu.Game/osu.Game.csproj                      |   3 -
 6 files changed, 242 insertions(+), 280 deletions(-)
 delete mode 100644 osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
 delete mode 100644 osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
 delete mode 100644 osu.Game/Graphics/UserInterface/OsuTabItem.cs

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index d8d4a93091..04b7d18de7 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -4,7 +4,13 @@
 using System.Linq;
 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.Primitives;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -36,5 +42,131 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem<T>(text, value) { AccentColour = AccentColour };
+
+        private class OsuDropdownMenuItem<U> : DropdownMenuItem<U>
+        {
+            public OsuDropdownMenuItem(string text, U value) : base(text, value)
+            {
+                Foreground.Padding = new MarginPadding(2);
+
+                Masking = true;
+                CornerRadius = 6;
+
+                Children = new[]
+                {
+                new FillFlowContainer
+                {
+                    Direction = FillDirection.Horizontal,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
+                    {
+                        chevron = new TextAwesome
+                        {
+                            AlwaysPresent = true,
+                            Icon = FontAwesome.fa_chevron_right,
+                            UseFullGlyphHeight = false,
+                            Colour = Color4.Black,
+                            Alpha = 0.5f,
+                            TextSize = 8,
+                            Margin = new MarginPadding { Left = 3, Right = 3 },
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                        },
+                        new OsuSpriteText {
+                            Text = text,
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                        }
+                    }
+                }
+            };
+            }
+
+            private Color4? accentColour;
+
+            private TextAwesome chevron;
+
+            protected override void FormatForeground(bool hover = false)
+            {
+                base.FormatForeground(hover);
+                chevron.Alpha = hover ? 1 : 0;
+            }
+
+            public Color4 AccentColour
+            {
+                get { return accentColour.GetValueOrDefault(); }
+                set
+                {
+                    accentColour = value;
+                    BackgroundColourHover = BackgroundColourSelected = value;
+                    FormatBackground();
+                    FormatForeground();
+                }
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = Color4.Transparent;
+                BackgroundColourHover = accentColour ?? colours.PinkDarker;
+                BackgroundColourSelected = Color4.Black.Opacity(0.5f);
+            }
+        }
+
+        protected class OsuDropdownHeader : DropdownHeader
+        {
+            private SpriteText label;
+            protected override string Label
+            {
+                get { return label.Text; }
+                set { label.Text = value; }
+            }
+
+            private Color4? accentColour;
+            public virtual Color4 AccentColour
+            {
+                get { return accentColour.GetValueOrDefault(); }
+                set
+                {
+                    accentColour = value;
+                    BackgroundColourHover = value;
+                }
+            }
+
+            public OsuDropdownHeader()
+            {
+                Foreground.Padding = new MarginPadding(4);
+
+                AutoSizeAxes = Axes.None;
+                Margin = new MarginPadding { Bottom = 4 };
+                CornerRadius = 4;
+                Height = 40;
+
+                Foreground.Children = new Drawable[]
+                {
+                label = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+                new TextAwesome
+                {
+                    Icon = FontAwesome.fa_chevron_down,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Margin = new MarginPadding { Right = 4 },
+                    TextSize = 20
+                }
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = Color4.Black.Opacity(0.5f);
+                BackgroundColourHover = accentColour ?? colours.PinkDarker;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs b/osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
deleted file mode 100644
index 8bef24a6f8..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
+++ /dev/null
@@ -1,69 +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.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
-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
-{
-    public class OsuDropdownHeader : DropdownHeader
-    {
-        private SpriteText label;
-        protected override string Label
-        {
-            get { return label.Text; }
-            set { label.Text = value; }
-        }
-
-        private Color4? accentColour;
-        public virtual Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                BackgroundColourHover = value;
-            }
-        }
-
-        public OsuDropdownHeader()
-        {
-            Foreground.Padding = new MarginPadding(4);
-
-            AutoSizeAxes = Axes.None;
-            Margin = new MarginPadding { Bottom = 4 };
-            CornerRadius = 4;
-            Height = 40;
-
-            Foreground.Children = new Drawable[]
-            {
-                label = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                },
-                new TextAwesome
-                {
-                    Icon = FontAwesome.fa_chevron_down,
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Margin = new MarginPadding { Right = 4 },
-                    TextSize = 20
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            BackgroundColour = Color4.Black.Opacity(0.5f);
-            BackgroundColourHover = accentColour ?? colours.PinkDarker;
-        }
-    }
-}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
deleted file mode 100644
index bcd53a8dbd..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
+++ /dev/null
@@ -1,85 +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.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.Sprites;
-using OpenTK.Graphics;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuDropdownMenuItem<T> : DropdownMenuItem<T>
-    {
-        public OsuDropdownMenuItem(string text, T value) : base(text, value)
-        {
-            Foreground.Padding = new MarginPadding(2);
-
-            Masking = true;
-            CornerRadius = 6;
-
-            Children = new[]
-            {
-                new FillFlowContainer
-                {
-                    Direction = FillDirection.Horizontal,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new Drawable[]
-                    {
-                        chevron = new TextAwesome
-                        {
-                            AlwaysPresent = true,
-                            Icon = FontAwesome.fa_chevron_right,
-                            UseFullGlyphHeight = false,
-                            Colour = Color4.Black,
-                            Alpha = 0.5f,
-                            TextSize = 8,
-                            Margin = new MarginPadding { Left = 3, Right = 3 },
-                            Origin = Anchor.CentreLeft,
-                            Anchor = Anchor.CentreLeft,
-                        },
-                        new OsuSpriteText {
-                            Text = text,
-                            Origin = Anchor.CentreLeft,
-                            Anchor = Anchor.CentreLeft,
-                        }
-                    }
-                }
-            };
-        }
-
-        private Color4? accentColour;
-
-        private TextAwesome chevron;
-
-        protected override void FormatForeground(bool hover = false)
-        {
-            base.FormatForeground(hover);
-            chevron.Alpha = hover ? 1 : 0;
-        }
-
-        public Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                BackgroundColourHover = BackgroundColourSelected = value;
-                FormatBackground();
-                FormatForeground();
-            }
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            BackgroundColour = Color4.Transparent;
-            BackgroundColourHover = accentColour ?? colours.PinkDarker;
-            BackgroundColourSelected = Color4.Black.Opacity(0.5f);
-        }
-    }
-}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 8a22347c76..20f75cf932 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -6,11 +6,15 @@ using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -53,7 +57,111 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public class OsuTabDropdown : OsuDropdown<T>
+        private class OsuTabItem<U> : TabItem<U>
+        {
+            private SpriteText text;
+            private Box box;
+
+            private Color4? accentColour;
+            public Color4 AccentColour
+            {
+                get { return accentColour.GetValueOrDefault(); }
+                set
+                {
+                    accentColour = value;
+                    if (!Active)
+                        text.Colour = value;
+                }
+            }
+
+            public new U Value
+            {
+                get { return base.Value; }
+                set
+                {
+                    base.Value = value;
+                    text.Text = (value as Enum)?.GetDescription();
+                }
+            }
+
+            public override bool Active
+            {
+                get { return base.Active; }
+                set
+                {
+                    if (Active == value) return;
+
+                    if (value)
+                        fadeActive();
+                    else
+                        fadeInactive();
+                    base.Active = value;
+                }
+            }
+
+            private const float transition_length = 500;
+
+            private void fadeActive()
+            {
+                box.FadeIn(transition_length, EasingTypes.OutQuint);
+                text.FadeColour(Color4.White, transition_length, EasingTypes.OutQuint);
+            }
+
+            private void fadeInactive()
+            {
+                box.FadeOut(transition_length, EasingTypes.OutQuint);
+                text.FadeColour(AccentColour, transition_length, EasingTypes.OutQuint);
+            }
+
+            protected override bool OnHover(InputState state)
+            {
+                if (!Active)
+                    fadeActive();
+                return true;
+            }
+
+            protected override void OnHoverLost(InputState state)
+            {
+                if (!Active)
+                    fadeInactive();
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                if (accentColour == null)
+                    AccentColour = colours.Blue;
+            }
+
+            public OsuTabItem()
+            {
+                AutoSizeAxes = Axes.X;
+                RelativeSizeAxes = Axes.Y;
+
+                Children = new Drawable[]
+                {
+                text = new OsuSpriteText
+                {
+                    Margin = new MarginPadding(5),
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    TextSize = 14,
+                    Font = @"Exo2.0-Bold", // Font should only turn bold when active?
+                },
+                box = new Box
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 1,
+                    Alpha = 0,
+                    Colour = Color4.White,
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                }
+                };
+            }
+        }
+
+        private class OsuTabDropdown : OsuDropdown<T>
         {
             protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
             {
@@ -80,7 +188,7 @@ namespace osu.Game.Graphics.UserInterface
                 DropdownMenu.MaxHeight = 400;
             }
 
-            public class OsuTabDropdownHeader : OsuDropdownHeader
+            protected class OsuTabDropdownHeader : OsuDropdownHeader
             {
                 public override Color4 AccentColour
                 {
diff --git a/osu.Game/Graphics/UserInterface/OsuTabItem.cs b/osu.Game/Graphics/UserInterface/OsuTabItem.cs
deleted file mode 100644
index acfca1b67b..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuTabItem.cs
+++ /dev/null
@@ -1,121 +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;
-using OpenTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input;
-using osu.Game.Graphics.Sprites;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuTabItem<T> : TabItem<T>
-    {
-        private SpriteText text;
-        private Box box;
-        
-        private Color4? accentColour;
-        public Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                if (!Active)
-                    text.Colour = value;
-            }
-        }
-
-        public new T Value
-        {
-            get { return base.Value; }
-            set
-            {
-                base.Value = value;
-                text.Text = (value as Enum)?.GetDescription();
-            }
-        }
-
-        public override bool Active
-        {
-            get { return base.Active; }
-            set
-            {
-                if (Active == value) return;
-
-                if (value)
-                    fadeActive();
-                else
-                    fadeInactive();
-                base.Active = value;
-            }
-        }
-
-        private const float transition_length = 500;
-
-        private void fadeActive()
-        {
-            box.FadeIn(transition_length, EasingTypes.OutQuint);
-            text.FadeColour(Color4.White, transition_length, EasingTypes.OutQuint);
-        }
-
-        private void fadeInactive()
-        {
-            box.FadeOut(transition_length, EasingTypes.OutQuint);
-            text.FadeColour(AccentColour, transition_length, EasingTypes.OutQuint);
-        }
-
-        protected override bool OnHover(InputState state)
-        {
-            if (!Active)
-                fadeActive();
-            return true;
-        }
-
-        protected override void OnHoverLost(InputState state)
-        {
-            if (!Active)
-                fadeInactive();
-        }
-
-        public OsuTabItem()
-        {
-            AutoSizeAxes = Axes.X;
-            RelativeSizeAxes = Axes.Y;
-
-            Children = new Drawable[]
-            {
-                text = new OsuSpriteText
-                {
-                    Margin = new MarginPadding(5),
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    TextSize = 14,
-                    Font = @"Exo2.0-Bold", // Font should only turn bold when active?
-                },
-                box = new Box
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 1,
-                    Alpha = 0,
-                    Colour = Color4.White,
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            if (accentColour == null)
-                AccentColour = colours.Blue;
-        }
-    }
-}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 879ca9ddbe..c2bb88d2f8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -161,9 +161,7 @@
     <Compile Include="Overlays\Notifications\SimpleNotification.cs" />
     <Compile Include="Overlays\Options\OptionDropDown.cs" />
     <Compile Include="Overlays\Options\OptionLabel.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropdownHeader.cs" />
     <Compile Include="Graphics\UserInterface\OsuDropdown.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" />
@@ -363,7 +361,6 @@
     <Compile Include="Users\Avatar.cs" />
     <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
     <Compile Include="Graphics\UserInterface\OsuTabControl.cs" />
-    <Compile Include="Graphics\UserInterface\OsuTabItem.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">

From 3dee39346fe61364a5e95910008c5afb0d4ff5e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 08:49:29 +0900
Subject: [PATCH 92/94] U -> T1.

---
 osu.Game/Graphics/UserInterface/OsuDropdown.cs   | 4 ++--
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 04b7d18de7..20b96a4045 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -43,9 +43,9 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem<T>(text, value) { AccentColour = AccentColour };
 
-        private class OsuDropdownMenuItem<U> : DropdownMenuItem<U>
+        private class OsuDropdownMenuItem<T1> : DropdownMenuItem<T1>
         {
-            public OsuDropdownMenuItem(string text, U value) : base(text, value)
+            public OsuDropdownMenuItem(string text, T1 value) : base(text, value)
             {
                 Foreground.Padding = new MarginPadding(2);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 20f75cf932..2f26a1ca30 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        private class OsuTabItem<U> : TabItem<U>
+        private class OsuTabItem<T1> : TabItem<T1>
         {
             private SpriteText text;
             private Box box;
@@ -74,7 +74,7 @@ namespace osu.Game.Graphics.UserInterface
                 }
             }
 
-            public new U Value
+            public new T1 Value
             {
                 get { return base.Value; }
                 set

From b0340f77d829850af2aff0aef48085cef3b49197 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 08:57:14 +0900
Subject: [PATCH 93/94] Remove nested types completely.

---
 osu.Game/Graphics/UserInterface/OsuDropdown.cs   | 8 ++++----
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 20b96a4045..7a31337660 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Graphics.UserInterface
                 accentColour = value;
                 if (Header != null)
                     ((OsuDropdownHeader)Header).AccentColour = value;
-                foreach (var item in MenuItems.OfType<OsuDropdownMenuItem<T>>())
+                foreach (var item in MenuItems.OfType<OsuDropdownMenuItem>())
                     item.AccentColour = value;
             }
         }
@@ -41,11 +41,11 @@ namespace osu.Game.Graphics.UserInterface
                 AccentColour = colours.PinkDarker;
         }
 
-        protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem<T>(text, value) { AccentColour = AccentColour };
+        protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem(text, value) { AccentColour = AccentColour };
 
-        private class OsuDropdownMenuItem<T1> : DropdownMenuItem<T1>
+        private class OsuDropdownMenuItem : DropdownMenuItem<T>
         {
-            public OsuDropdownMenuItem(string text, T1 value) : base(text, value)
+            public OsuDropdownMenuItem(string text, T value) : base(text, value)
             {
                 Foreground.Padding = new MarginPadding(2);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 2f26a1ca30..8283c1baa0 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Graphics.UserInterface
     {
         protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown();
 
-        protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
+        protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem { Value = value };
 
         protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
 
@@ -52,12 +52,12 @@ namespace osu.Game.Graphics.UserInterface
                 var dropDown = Dropdown as OsuTabDropdown;
                 if (dropDown != null)
                     dropDown.AccentColour = value;
-                foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
+                foreach (var item in TabContainer.Children.OfType<OsuTabItem>())
                     item.AccentColour = value;
             }
         }
 
-        private class OsuTabItem<T1> : TabItem<T1>
+        private class OsuTabItem : TabItem<T>
         {
             private SpriteText text;
             private Box box;
@@ -74,7 +74,7 @@ namespace osu.Game.Graphics.UserInterface
                 }
             }
 
-            public new T1 Value
+            public new T Value
             {
                 get { return base.Value; }
                 set

From 859ee5d316d99f6f74d1c3188fcab9c8138d8071 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 10:07:26 +0900
Subject: [PATCH 94/94] Tidy up DatabaseWorkingBeatmap.

---
 osu.Game/Database/DatabaseWorkingBeatmap.cs | 28 ++++++++-------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 0a7779f17b..1b37cf2fa0 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -21,12 +21,13 @@ namespace osu.Game.Database
         }
 
         private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
-        
+
         protected override Beatmap GetBeatmap()
         {
-            Beatmap beatmap;
             try
             {
+                Beatmap beatmap;
+
                 using (var reader = getReader())
                 {
                     BeatmapDecoder decoder;
@@ -40,42 +41,33 @@ namespace osu.Game.Database
                         using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
                             decoder.Decode(stream, beatmap);
                 }
+
+                return beatmap;
             }
             catch { return null; }
-            return beatmap;
         }
-        
+
         protected override Texture GetBackground()
         {
-            Texture background;
             if (BeatmapInfo?.Metadata?.BackgroundFile == null)
                 return null;
+
             try
             {
                 using (var reader = getReader())
-                {
-                    background = new TextureStore(
-                        new RawTextureLoaderStore(reader),
-                        false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                }
+                    return new TextureStore(new RawTextureLoaderStore(reader), false).Get(BeatmapInfo.Metadata.BackgroundFile);
             }
             catch { return null; }
-            return background;
         }
 
-        private ArchiveReader trackReader;
         protected override Track GetTrack()
         {
-            Track track;
             try
             {
-                //store a reference to the reader as we may continue accessing the stream in the background.
-                trackReader = getReader();
-                var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                track = trackData == null ? null : new TrackBass(trackData);
+                var trackData = getReader()?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                return trackData == null ? null : new TrackBass(trackData);
             }
             catch { return null; }
-            return track;
         }
     }
 }
\ No newline at end of file