- Added solutions by Kevin Colyer.

11 files changed, 1083 insertions, 878 deletions

diff --git a/challenge-017/kevin-colyer/perl6/ch-1.p6 b/challenge-017/kevin-colyer/perl6/ch-1.p6
new file mode 100644
index 0000000000..8c69797e6d
--- /dev/null
+++ b/challenge-017/kevin-colyer/perl6/ch-1.p6
@@ -0,0 +1,31 @@
+#!/usr/bin/perl6
+use v6;
+
+use Test;
+
+#Task #1
+# Create a script to demonstrate Ackermann function. The Ackermann function is defined as below, m and n are positive number:
+#
+#   A(m, n) = n + 1                  if m = 0
+#   A(m, n) = A(m - 1, 1)            if m > 0 and n = 0
+#   A(m, n) = A(m - 1, A(m, n - 1))  if m > 0 and n > 0
+
+#| Ackermann function
+multi MAIN( $m, $n ) {
+    say Ackermann($m,$n);
+}
+
+multi Ackermann($m where $m==0,$n)              { return $n + 1 }
+multi Ackermann($m where $m>0, $n where $n==0)  { return Ackermann( $m - 1, 1 ) }
+multi Ackermann($m where $m>0, $n where $n>0)   { return Ackermann( $m - 1, Ackermann( $m, $n - 1 ) ) }
+
+
+multi MAIN ( "test" ) {
+ is Ackermann( 0, 0 ),1,"0,0=1";
+ is Ackermann( 1, 0 ),2,"1,0=2";
+ is Ackermann( 3, 3 ),61,"3,3=61";
+ is Ackermann( 0, 1 ),2,"0,1=2";
+ is Ackermann( 0, 4 ),5,"0,4=5";
+ is Ackermann( 1, 2 ),4,"1,2=4";
+
+}
diff --git a/challenge-017/kevin-colyer/perl6/ch-2.p6 b/challenge-017/kevin-colyer/perl6/ch-2.p6
new file mode 100644
index 0000000000..1d9b5d4308
--- /dev/null
+++ b/challenge-017/kevin-colyer/perl6/ch-2.p6
@@ -0,0 +1,159 @@
+#!/usr/bin/perl6
+use v6;
+
+use Test;
+# use Grammar::Tracer;
+
+# Create a script to parse URL and print the components of URL. According to Wiki page, the URL syntax is as below:
+#
+# scheme:[//[userinfo@]host[:port]]path[?query][#fragment]
+#
+# For example: jdbc:mysql://user:password@localhost:3306/pwc?profile=true#h1
+#
+#   scheme:   jdbc:mysql
+#   userinfo: user:password
+#   host:     localhost
+#   port:     3306
+#   path:     /pwc
+#   query:    profile=true
+#   fragment: h1
+
+#| URL parse validator
+multi MAIN( $url ) {
+    my $m=urlParse($url);
+    say "$_ => {$m.made{$_}}" for  $m.made.keys;
+}
+
+#| Run tests
+multi MAIN ( "test" ) {
+
+    ok urlParse("http:/a/path"),"1 scheme and path test";
+    ok urlParse("http:/path"),"2 scheme and path test";
+
+    ok urlParse("http://localhost/path"),"3 scheme, authority and path test";
+    ok urlParse("http://example.com/path"),"4 scheme, authority and path test";
+    ok urlParse("http://example.co.uk/path"),"5 scheme, authority and path test";
+    ok urlParse("http://example.co.uk:1234/path"),"6 scheme, authority and path test";
+    ok urlParse("http://1.1.1.1/path"),"7 scheme, authority and path test";
+    ok urlParse('http://kevin@example.co.uk/path'),"8 scheme, authority and path test";
+    ok urlParse('http://kevin:mypasword@example.co.uk/path'),"9 scheme, authority and path test";
+    ok urlParse('http://kevin:mypasword@example.co.uk:1234/path'),"10 scheme, authority and path test";
+    ok urlParse('http://kevin:mypasword@example.co.uk:1234/a/path'),"11 scheme, authority and path test";
+
+    ok urlParse('http://kevin:mypasword@example.co.uk:1234/a/path?profile=true'),"12 s,a,p, and query test";
+    ok urlParse('http://kevin:mypasword@example.co.uk:1234/a/path?profile=true;black=white;up=down'),"13 s,a,p, multi q test";
+    ok urlParse('http://kevin:mypasword@example.co.uk:1234/a/path?profile=true&black=white&up=down'),"14 s,a,p, multi q test";
+
+    todo "can't get trailing delims to work yet";
+    ok urlParse('http://kevin:mypasword@example.co.uk:1234/a/path?profile=true&black=white&up=down&'),"14 s,a,p, multi q test with trailing delim";
+
+    ok urlParse('http://kevin:mypasword@example.co.uk:1234/a/path#m1'),"15 s,a,p, and fragment test";
+    ok urlParse('http://kevin:mypasword@example.co.uk:1234/a/path?profile=true#m1'),"16 s,a,p,q and fragment test";
+    ok urlParse('http://kevin:mypasword@example.co.uk:1234/a/path?profile=true;black=white;up=down#m1'),"17 s,a,p, multi q and fragment test";
+
+    ok urlParse("jdbc:mysql://1.1.1.1/path"),"7.1 double scheme, authority and path test";
+
+    my $url='jdbc:mysql://user:password@localhost:3306/pwc?profile=true#h1';
+    ok urlParse($url), "$url parses ok";
+
+    my $m=urlParse($url);
+    is ~$m.made<scheme>   , 'jdbc:mysql'   ,'testing <scheme>   is made correctly';
+    is ~$m.made<userinfo> , 'user:password','testing <userinfo> is made correctly';
+    is ~$m.made<host>     , 'localhost'    ,'testing <host>     is made correctly';
+    is ~$m.made<port>     , '3306'         ,'testing <port>     is made correctly';
+    is ~$m.made<path>     , '/pwc'         ,'testing <path>     is made correctly';
+    is ~$m.made<query>    , 'profile=true' ,'testing <query>    is made correctly';
+    is ~$m.made<fragment> , 'h1'           ,'testing <fragment> is made correctly';
+
+    done-testing;
+}
+
+
+# scheme:[//[userinfo@]host[:port]]path[?query][#fragment]
+
+grammar URL {
+    token TOP {
+        <scheme>
+        <authority>?
+        <path>?
+        <query>?
+        <fragment>?
+    }
+    # A non-empty scheme component followed by a colon (:), consisting of a sequence of characters beginning with a letter and followed by any combination of letters, digits, plus (+), period (.), or hyphen (-)
+    token allowedchars {
+        <alnum> |  '+' | '.' | '-' # does alpha include _? does Alnum?
+    }
+    token scheme_text {
+        <alpha>  <allowedchars>*
+    }
+    token scheme {
+       #| <scheme_text>
+       [ <scheme_text> ':' ] ** 1..2
+       #| <scheme_text> ':' <scheme_text>
+    }
+    #A path component, consisting of a sequence of path segments separated by a slash (/). A path is always defined for a URI, though the defined path may be empty (zero length). A segment may also be empty, resulting in two consecutive slashes (//) in the path component. A path component may resemble or map exactly to a file system path, but does not always imply a relation to one. If an authority component is present, then the path component must either be empty or begin with a slash (/). If an authority component is absent, then the path cannot begin with an empty segment, that is with two slashes (//), as the following characters would be interpreted as an authority component.[18] The final segment of the path may be referred to as a 'slug'.
+    token authority {
+        '//'
+        <userinfo>?
+        <host>
+        [':' <port>]?
+    }
+    token slug {
+        <alnum>+
+    }
+    token userinfo {
+        | <slug> '@'
+        | <slug> ':' <slug> '@'
+    }
+    token host {
+        <slug> ['.' <slug>]*
+    }
+    token port {
+        <digit>+
+    }
+    token path {
+        | '/' [ <slug> '/' '/'? ]+ <slug>
+        | '/' <slug>
+    }
+    # An optional query component preceded by a question mark (?), containing a query string of non-hierarchical data. Its syntax is not well defined, but by convention is most often a sequence of attribute–value pairs separated by a delimiter. (& or ;)
+    token query {
+#         | '?' <attrib-value>
+     #   | '?' <attrib-value> 1..* % <delim>
+        | '?' [<attrib-value> <delim>]* <attrib-value>
+    }
+    token attrib-value {
+        <slug> '=' <slug>
+    }
+    token delim {
+        ';' | '&'
+    }
+    token fragment {
+        '#' <slug>
+    }
+}
+
+class URL-actions {
+
+    method TOP ($/) {
+        make {
+            scheme =>   $<scheme>.subst(/\: $$/,""),
+            userinfo => $<authority><userinfo>.subst(/\@/,""),
+            host     => $<authority><host>,
+            port     => $<authority><port>,
+            path     => $<path>,
+            query    => $<query>.subst(/^^  '?' /,""),
+            fragment => $<fragment>.subst(/^^  '#' /,""),
+        }
+    }
+
+}
+
+sub urlParse($url) {
+
+    my $m=URL.parse($url, actions => URL-actions.new);
+
+    # $m ?? "OK $url" !! "NOT OK $url";
+    return $m;
+}
+
+
diff --git a/stats/pwc-current.json b/stats/pwc-current.json
index f375ad64fd..a1c0e30d7a 100644
--- a/stats/pwc-current.json
+++ b/stats/pwc-current.json
@@ -1,92 +1,23 @@
 {
    "plotOptions" : {
       "series" : {
-         "borderWidth" : 0,
          "dataLabels" : {
             "format" : "{point.y}",
             "enabled" : 1
-         }
+         },
+         "borderWidth" : 0
       }
    },
-   "title" : {
-      "text" : "Perl Weekly Challenge - 017"
-   },
-   "xAxis" : {
-      "type" : "category"
-   },
-   "chart" : {
-      "type" : "column"
+   "subtitle" : {
+      "text" : "[Champions: 12] Last updated at 2019-07-20 18:45:14 GMT"
    },
-   "series" : [
-      {
-         "colorByPoint" : 1,
-         "name" : "Perl Weekly Challenge - 017",
-         "data" : [
-            {
-               "y" : 2,
-               "drilldown" : "Andrezgz",
-               "name" : "Andrezgz"
-            },
-            {
-               "drilldown" : "Dave Jacoby",
-               "name" : "Dave Jacoby",
-               "y" : 3
-            },
-            {
-               "name" : "Duane Powell",
-               "drilldown" : "Duane Powell",
-               "y" : 2
-            },
-            {
-               "name" : "E. Choroba",
-               "drilldown" : "E. Choroba",
-               "y" : 3
-            },
-            {
-               "y" : 5,
-               "drilldown" : "Laurent Rosenfeld",
-               "name" : "Laurent Rosenfeld"
-            },
-            {
-               "y" : 2,
-               "name" : "Lubos Kolouch",
-               "drilldown" : "Lubos Kolouch"
-            },
-            {
-               "name" : "Michael Hamlin",
-               "drilldown" : "Michael Hamlin",
-               "y" : 1
-            },
-            {
-               "drilldown" : "Noud",
-               "name" : "Noud",
-               "y" : 2
-            },
-            {
-               "name" : "Roger Bell West",
-               "drilldown" : "Roger Bell West",
-               "y" : 2
-            },
-            {
-               "y" : 1,
-               "drilldown" : "Simon Proctor",
-               "name" : "Simon Proctor"
-            },
-            {
-               "y" : 4,
-               "drilldown" : "Veesh Goldman",
-               "name" : "Veesh Goldman"
-            }
-         ]
+   "yAxis" : {
+      "title" : {
+         "text" : "Total Solutions"
       }
-   ],
-   "tooltip" : {
-      "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>",
-      "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>",
-      "followPointer" : 1
    },
-   "legend" : {
-      "enabled" : 0
+   "xAxis" : {
+      "type" : "category"
    },
    "drilldown" : {
       "series" : [
@@ -97,12 +28,12 @@
                   2
                ]
             ],
-            "id" : "Andrezgz",
-            "name" : "Andrezgz"
+            "name" : "Andrezgz",
+            "id" : "Andrezgz"
          },
          {
-            "name" : "Dave Jacoby",
             "id" : "Dave Jacoby",
+            "name" : "Dave Jacoby",
             "data" : [
                [
                   "Perl 5",
@@ -115,18 +46,16 @@
             ]
          },
          {
-            "name" : "Duane Powell",
             "data" : [
                [
                   "Perl 5",
                   2
                ]
             ],
+            "name" : "Duane Powell",
             "id" : "Duane Powell"
          },
          {
-            "name" : "E. Choroba",
-            "id" : "E. Choroba",
             "data" : [
                [
                   "Perl 5",
@@ -136,6 +65,18 @@
                   "Blog",
                   1
                ]
+            ],
+            "id" : "E. Choroba",
+            "name" : "E. Choroba"
+         },
+         {
+            "name" : "Kevin Colyer",
+            "id" : "Kevin Colyer",
+            "data" : [
+               [
+                  "Perl 6",
+                  2
+               ]
             ]
          },
          {
@@ -153,58 +94,58 @@
                   1
                ]
             ],
-            "id" : "Laurent Rosenfeld",
-            "name" : "Laurent Rosenfeld"
+            "name" : "Laurent Rosenfeld",
+            "id" : "Laurent Rosenfeld"
          },
          {
-            "name" : "Lubos Kolouch",
             "data" : [
                [
                   "Perl 5",
                   2
                ]
             ],
+            "name" : "Lubos Kolouch",
             "id" : "Lubos Kolouch"
          },
          {
+            "id" : "Michael Hamlin",
+            "name" : "Michael Hamlin",
             "data" : [
                [
                   "Perl 5",
                   1
                ]
-            ],
-            "id" : "Michael Hamlin",
-            "name" : "Michael Hamlin"
+            ]
          },
          {
+            "name" : "Noud",
             "id" : "Noud",
             "data" : [
                [
                   "Perl 6",
                   2
                ]
-            ],
-            "name" : "Noud"
+            ]
          },
          {
-            "name" : "Roger Bell West",
             "data" : [
                [
                   "Perl 5",
                   2
                ]
             ],
+            "name" : "Roger Bell West",
             "id" : "Roger Bell West"
          },
          {
+            "id" : "Simon Proctor",
+            "name" : "Simon Proctor",
             "data" : [
                [
                   "Perl 6",
                   1
                ]
-            ],
-            "id" : "Simon Proctor",
-            "name" : "Simon Proctor"
+            ]
          },
          {
             "data" : [
@@ -226,12 +167,86 @@
          }
       ]
    },
-   "yAxis" : {
-      "title" : {
-         "text" : "Total Solutions"
+   "tooltip" : {
+      "followPointer" : 1,
+      "headerFormat" : "<span style='font-size:11px'>{series.name}</span><br/>",
+      "pointFormat" : "<span style='color:{point.color}'>{point.name}</span>: <b>{point.y:f}</b><br/>"
+   },
+   "series" : [
+      {
+         "data" : [
+            {
+               "drilldown" : "Andrezgz",
+               "name" : "Andrezgz",
+               "y" : 2
+            },
+            {
+               "y" : 3,
+               "drilldown" : "Dave Jacoby",
+               "name" : "Dave Jacoby"
+            },
+            {
+               "y" : 2,
+               "drilldown" : "Duane Powell",
+               "name" : "Duane Powell"
+            },
+            {
+               "y" : 3,
+               "drilldown" : "E. Choroba",
+               "name" : "E. Choroba"
+            },
+            {
+               "name" : "Kevin Colyer",
+               "drilldown" : "Kevin Colyer",
+               "y" : 2
+            },
+            {
+               "y" : 5,
+               "name" : "Laurent Rosenfeld",
+               "drilldown" : "Laurent Rosenfeld"
+            },
+            {
+               "drilldown" : "Lubos Kolouch",
+               "name" : "Lubos Kolouch",
+               "y" : 2
+            },
+            {
+               "y" : 1,
+               "name" : "Michael Hamlin",
+               "drilldown" : "Michael Hamlin"
+            },
+            {
+               "y" : 2,
+               "drilldown" : "Noud",
+               "name" : "Noud"
+            },
+            {
+               "y" : 2,
+               "name" : "Roger Bell West",
+               "drilldown" : "Roger Bell West"
+            },
+            {
+               "name" : "Simon Proctor",
+               "drilldown" : "Simon Proctor",
+               "y" : 1
+            },
+            {
+               "name" : "Veesh Goldman",
+               "drilldown" : "Veesh Goldman",
+               "y" : 4
+            }
+         ],
+         "colorByPoint" : 1,
+         "name" : "Perl Weekly Challenge - 017"
       }
+   ],
+   "chart" : {
+      "type" : "column"
    },
-   "subtitle" : {
-      "text" : "[Champions: 11] Last updated at 2019-07-19 22:35:12 GMT"
+   "legend" : {
+      "enabled" : 0
+   },
+   "title" : {
+      "text" : "Perl Weekly Challenge - 017"
    }
 }
diff --git a/stats/pwc-language-breakdown-summary.json b/stats/pwc-language-breakdown-summary.json
index 2db790d95b..719ab10868 100644
--- a/stats/pwc-language-breakdown-summary.json
+++ b/stats/pwc-language-breakdown-summary.json
@@ -1,37 +1,18 @@
 {
-   "xAxis" : {
-      "labels" : {
-         "style" : {
-            "fontFamily" : "Verdana, sans-serif",
-            "fontSize" : "13px"
-         }
-      },
-      "type" : "category"
-   },
-   "title" : {
-      "text" : "Perl Weekly Challenge Contributions - 2019"
-   },
-   "legend" : {
-      "enabled" : "false"
-   },
-   "tooltip" : {
-      "pointFormat" : "<b>{point.y:.0f}</b>"
+   "subtitle" : {
+      "text" : "Last updated at 2019-07-20 18:45:38 GMT"
    },
    "yAxis" : {
+      "min" : 0,
       "title" : {
          "text" : null
-      },
-      "min" : 0
-   },
-   "chart" : {
-      "type" : "column"
+      }
    },
-   "subtitle" : {
-      "text" : "Last updated at 2019-07-19 22:35:23 GMT"
+   "title" : {
+      "text" : "Perl Weekly Challenge Contributions - 2019"
    },
    "series" : [
       {
-         "name" : "Contributions",
          "data" : [
             [
                "Blog",
@@ -43,21 +24,40 @@
             ],
             [
                "Perl 6",
-               392
+               394
             ]
          ],
+         "name" : "Contributions",
          "dataLabels" : {
-            "rotation" : -90,
-            "align" : "right",
+            "style" : {
+               "fontFamily" : "Verdana, sans-serif",
+               "fontSize" : "13px"
+            },
+            "format" : "{point.y:.0f}",
             "color" : "#FFFFFF",
+            "align" : "right",
             "y" : 10,
             "enabled" : "true",
-            "style" : {
-               "fontSize" : "13px",
-               "fontFamily" : "Verdana, sans-serif"
-            },
-            "format" : "{point.y:.0f}"
+            "rotation" : -90
          }
       }
-   ]
+   ],
+   "tooltip" : {
+      "pointFormat" : "<b>{point.y:.0f}</b>"
+   },
+   "xAxis" : {
+      "type" : "category",
+      "labels" : {
+         "style" : {
+            "fontFamily" : "Verdana, sans-serif",
+            "fontSize" : "13px"
+         }
+      }
+   },
+   "legend" : {
+      "enabled" : "false"
+   },
+   "chart" : {
+      "type" : "column"
+   }
 }
diff --git a/stats/pwc-language-breakdown.json b/stats/pwc-language-breakdown.json
index 3537380a08..f437f63fc3 100644
--- a/stats/pwc-language-breakdown.json
+++ b/stats/pwc-language-breakdown.json
@@ -1,12 +1,29 @@
 {
-   "chart" : {
-      "type" : "column"
+   "yAxis" : {
+      "title" : {
+         "text" : "Total Solutions"
+      }
    },
    "subtitle" : {
-      "text" : "Click the columns to drilldown the language breakdown. Last updated at 2019-07-19 22:35:23 GMT"
+      "text" : "Click the columns to drilldown the language breakdown. Last updated at 2019-07-20 18:45:38 GMT"
+   },
+   "title" : {
+      "text" : "Perl Weekly Challenge Language"
+   },
+   "tooltip" : {
+      "followPointer" : "true",
+      "headerFormat" : "<span style=\"font-size:11px\"></span>",
+      "pointFormat" : "<span style=\"color:{point.color}\">Challenge {point.name}</span>: <b>{point.y:f}</b><br/>"
+   },
+   "xAxis" : {
+      "type" : "category"
+   },
+   "legend" : {
+      "enabled" : "false"
    },
    "series" : [
       {
+         "colorByPoint" : "true",
          "name" : "Perl Weekly Challenge Languages",
          "data" : [
             {
@@ -20,29 +37,29 @@
                "y" : 104
             },
             {
-               "drilldown" : "003",
                "name" : "#003",
-               "y" : 66
+               "y" : 66,
+               "drilldown" : "003"
             },
             {
-               "drilldown" : "004",
+               "y" : 84,
                "name" : "#004",
-               "y" : 84
+               "drilldown" : "004"
             },
             {
-               "name" : "#005",
+               "drilldown" : "005",
                "y" : 66,
-               "drilldown" : "005"
+               "name" : "#005"
             },
             {
+               "drilldown" : "006",
                "y" : 47,
-               "name" : "#006",
-               "drilldown" : "006"
+               "name" : "#006"
             },
             {
+               "drilldown" : "007",
                "y" : 54,
-               "name" : "#007",
-               "drilldown" : "007"
+               "name" : "#007"
             },
             {
                "drilldown" : "008",
@@ -50,14 +67,14 @@
                "y" : 67
             },
             {
-               "drilldown" : "009",
+               "y" : 65,
                "name" : "#009",
-               "y" : 65
+               "drilldown" : "009"
             },
             {
-               "drilldown" : "010",
+               "name" : "#010",
                "y" : 58,
-               "name" : "#010"
+               "drilldown" : "010"
             },
             {
                "drilldown" : "011",
@@ -65,9 +82,9 @@
                "name" : "#011"
             },
             {
-               "name" : "#012",
+               "drilldown" : "012",
                "y" : 81,
-               "drilldown" : "012"
+               "name" : "#012"
             },
             {
                "drilldown" : "013",
@@ -85,30 +102,24 @@
                "drilldown" : "015"
             },
             {
-               "drilldown" : "016",
                "name" : "#016",
-               "y" : 64
+               "y" : 64,
+               "drilldown" : "016"
             },
             {
                "drilldown" : "017",
                "name" : "#017",
-               "y" : 27
+               "y" : 29
             }
-         ],
-         "colorByPoint" : "true"
+         ]
       }
    ],
-   "xAxis" : {
-      "type" : "category"
-   },
-   "title" : {
-      "text" : "Perl Weekly Challenge Language"
+   "chart" : {
+      "type" : "column"
    },
    "drilldown" : {
       "series" : [
          {
-            "id" : "001",
-            "name" : "001",
             "data" : [
                [
                   "Perl 5",
@@ -122,11 +133,11 @@
                   "Blog",
                   10
                ]
-            ]
+            ],
+            "id" : "001",
+            "name" : "001"
          },
          {
-            "id" : "002",
-            "name" : "002",
             "data" : [
                [
                   "Perl 5",
@@ -140,10 +151,12 @@
                   "Blog",
                   9
                ]
-            ]
+            ],
+            "id" : "002",
+            "name" : "002"
          },
          {
-            "id" : "003",
+            "name" : "003",
             "data" : [
                [
                   "Perl 5",
@@ -158,11 +171,10 @@
                   8
                ]
             ],
-            "name" : "003"
+            "id" : "003"
          },
          {
             "id" : "004",
-            "name" : "004",
             "data" : [
                [
                   "Perl 5",
@@ -176,9 +188,11 @@
                   "Blog",
                   9
                ]
-            ]
+            ],
+            "name" : "004"
          },
          {
+            "name" : "005",
             "data" : [
                [
                   "Perl 5",
@@ -193,11 +207,10 @@
                   11
                ]
             ],
-            "name" : "005",
             "id" : "005"
          },
          {
-            "id" : "006",
+            "name" : "006",
             "data" : [
                [
                   "Perl 5",
@@ -212,10 +225,9 @@
                   6
                ]
             ],
-            "name" : "006"
+            "id" : "006"
          },
          {
-            "id" : "007",
             "name" : "007",
             "data" : [
                [
@@ -230,10 +242,10 @@
                   "Blog",
                   8
                ]
-            ]
+            ],
+            "id" : "007"
          },
          {
-            "id" : "008",
             "name" : "008",
             "data" : [
                [
@@ -248,11 +260,10 @@
                   "Blog",
                   9
                ]
-            ]
+            ],
+            "id" : "008"
          },
          {
-            "id" : "009",
-            "name" : "009",
             "data" : [
                [
                   "Perl 5",
@@ -266,9 +277,12 @@
                   "Blog",
                   11
                ]
-            ]
+            ],
+            "id" : "009",
+            "name" : "009"
          },
          {
+            "id" : "010",
             "data" : [
                [
                   "Perl 5",
@@ -283,8 +297,7 @@
                   9
                ]
             ],
-            "name" : "010",
-            "id" : "010"
+            "name" : "010"
          },
          {
             "id" : "011",
@@ -305,7 +318,7 @@
             "name" : "011"
          },
          {
-            "name" : "012",
+            "id" : "012",
             "data" : [
                [
                   "Perl 5",
@@ -320,7 +333,7 @@
                   9
                ]
             ],
-            "id" : "012"
+            "name" : "012"
          },
          {
             "id" : "013",
@@ -341,6 +354,7 @@
             "name" : "013"
          },
          {
+            "name" : "014",
             "data" : [
                [
                   "Perl 5",
@@ -355,12 +369,9 @@
                   13
                ]
             ],
-            "name" : "014",
             "id" : "014"
          },
          {
-            "id" : "015",
-            "name" : "015",
             "data" : [
                [
                   "Perl 5",
@@ -374,10 +385,11 @@
                   "Blog",
                   12
                ]
-            ]
+            ],
+            "id" : "015",
+            "name" : "015"
          },
          {
-            "id" : "016",
             "name" : "016",
             "data" : [
                [
@@ -392,11 +404,12 @@
                   "Blog",
                   10
                ]
-            ]
+            ],
+            "id" : "016"
          },
          {
-            "id" : "017",
             "name" : "017",
+            "id" : "017",
             "data" : [
                [
                   "Perl 5",
@@ -404,7 +417,7 @@
                ],
                [
                   "Perl 6",
-                  6
+                  8
                ],
                [
                   "Blog",
@@ -414,14 +427,6 @@
          }
       ]
    },
-   "legend" : {
-      "enabled" : "false"
-   },
-   "yAxis" : {
-      "title" : {
-         "text" : "Total Solutions"
-      }
-   },
    "plotOptions" : {
       "series" : {
          "dataLabels" : {
@@ -430,10 +435,5 @@
          },
          "borderWidth" : 0
       }
-   },
-   "tooltip" : {
-      "headerFormat" : "<span style=\"font-size:11px\"></span>",
-      "pointFormat" : "<span style=\"color:{point.color}\">Challenge {point.name}</span>: <b>{point.y:f}</b><br/>",
-      "followPointer" : "true"
    }
 }
diff --git a/stats/pwc-leaders.json b/stats/pwc-leaders.json
index 830f0022b2..1aa54b4c26 100644
--- a/stats/pwc-leaders.json
+++ b/stats/pwc-leaders.json
@@ -1,292 +1,23 @@
 {
-   "xAxis" : {
-      "type" : "category"
-   },
    "subtitle" : {
-      "text" : "Click the columns to drilldown the score breakdown. Last updated at 2019-07-19 22:35:19 GMT"
-   },
-   "legend" : {
-      "enabled" : "false"
+      "text" : "Click the columns to drilldown the score breakdown. Last updated at 2019-07-20 18:45:33 GMT"
    },
-   "tooltip" : {
-      "headerFormat" : "<span style=\"font-size:11px\"></span>",
-      "pointFormat" : "<span style=\"color:{point.color}\">{point.name}</span>: <b>{point.y:f}</b><br/>",
-      "followPointer" : "true"
-   },
-   "series" : [
-      {
-         "data" : [
-            {
-               "drilldown" : "Laurent Rosenfeld",
-               "name" : "#1: Laurent Rosenfeld",
-               "y" : 176
-            },
-            {
-               "drilldown" : "Joelle Maslak",
-               "y" : 168,
-               "name" : "#2: Joelle Maslak"
-            },
-            {
-               "name" : "#3: Jaldhar H. Vyas",
-               "y" : 130,
-               "drilldown" : "Jaldhar H. Vyas"
-            },
-            {
-               "drilldown" : "Ruben Westerberg",
-               "y" : 116,
-               "name" : "#4: Ruben Westerberg"
-            },
-            {
-               "drilldown" : "Athanasius",
-               "y" : 98,
-               "name" : "#5: Athanasius"
-            },
-            {
-               "name" : "#6: Adam Russell",
-               "y" : 96,
-               "drilldown" : "Adam Russell"
-            },
-            {
-               "drilldown" : "Arne Sommer",
-               "name" : "#7: Arne Sommer",
-               "y"