diff --git a/assets/css/src/style.scss b/assets/css/src/style.scss
index 9ca8214..34dd50d 100644
--- a/assets/css/src/style.scss
+++ b/assets/css/src/style.scss
@@ -12,8 +12,8 @@ $bgcolor: #2f6f2a;
 $line: 0.2rem;
 
 @mixin border {
-  border-radius: 0.25em;
-  border: 0.3em black solid;
+  border-radius: 0.5rem;
+  border: 0.3rem black solid;
 }
 
 @mixin button {
@@ -193,49 +193,12 @@ h1,h2,h3,h4,h5,h6{
   }
 }
 
-body.home{
-  header{
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 42%;
-    &>img{
-      display: block;
-      width: 50%;
-      height: auto;
-    }
-  }
-  h1{
-    text-align: center;
-    color: white;
-    font-size: 2.6rem;
-    text-shadow: $shadow;
-  }
-  .menu{
-    flex-grow: 1;
-    display: flex;
-    align-items: center;
-    padding-bottom: 7.5rem;
-
-    .mainmenu{
-      width: 100%;
-      display: flex;
-      align-items: center;
-      flex-direction: column;
-      justify-content: center;
-      h1{
-        margin-bottom: 1em;
-      }
-    }
-
-  }
-}
-
 
 nav.list{
   display: flex;
   justify-content: center;
   flex-grow: 1;
+  width: 100%;
 
   &.horizontal{
     flex-direction: row;
@@ -257,12 +220,12 @@ nav.list{
 // Elements
 ////////////////////////////////////////////////////////////////////////////////
 
-
 .element{
   @include border;
   border-width: 0.3rem;
   background-color: $bg;
   cursor: pointer;
+  box-shadow: 0.25rem 0.25rem 1rem rgba(0,0,0, 0.3);
 
   &:focus, &:hover{
     outline: none;
@@ -283,6 +246,7 @@ nav.list{
     justify-content: flex-start;
     align-items: center;
     padding: 0.7em;
+    height: 4.5em;
 
     h2{
       font-size: 1.3em;
@@ -300,13 +264,48 @@ nav.list{
     }
   }
 
+  &.scorer{
+    @include button-text;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    padding: 0.7em;
+    height: 4.5em;
+
+    .player{
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      min-width: 0;
+      flex-basis: 0;
+      flex-grow: 1;
+      text-align: left;
+      
+      h2{
+        font-size: 1.3em;
+      }
+
+      &>*{
+        margin-right: 1em;
+      }
+
+      img{
+        height: 3em;
+        aspect-ratio: 1/1;
+        object-position: top;
+        object-fit: cover;
+      }
+    }
+
+  }
+
   &.plain{
     @include button-text;
     padding: 1rem 2rem;
     justify-content: center;
     align-items: center;
-    box-shadow: 0.25rem 0.25rem 1rem rgba(0,0,0, 0.3);
     font-size: 1.6em;
+
     &:hover,&:focus{
       background-color: rgba(0, 0, 0, 0.2);
       border-color: $orange;
@@ -319,9 +318,7 @@ nav.list{
       background-color: darken($bg, 5%);
     }
   }
-  &.player {
-    height: 4.5em;
-  }
+
   &.square{
     font-size: 1rem;
     width: 20em;
@@ -365,9 +362,52 @@ nav.list{
   }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Home
+////////////////////////////////////////////////////////////////////////////////
+
+body.home{
+  header{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 42%;
+    &>img{
+      display: block;
+      width: 50%;
+      height: auto;
+    }
+  }
+  h1{
+    text-align: center;
+    color: white;
+    font-size: 2.6rem;
+    text-shadow: $shadow;
+  }
+  .menu{
+    flex-grow: 1;
+    display: flex;
+    align-items: center;
+    padding-bottom: 7.5rem;
+
+    .mainmenu{
+      width: 60%;
+      margin: 0 auto;
+      display: flex;
+      align-items: center;
+      flex-direction: column;
+      justify-content: center;
+      h1{
+        margin-bottom: 1em;
+      }
+    }
+
+  }
+}
+
 
 ////////////////////////////////////////////////////////////////////////////////
-// Game Setup
+// Game
 ////////////////////////////////////////////////////////////////////////////////
 
 body.xoi{
@@ -402,8 +442,8 @@ body.xoi{
     grid-template-columns: 3fr 3fr 2fr 3fr 3fr;
     grid-template-rows: 11.5rem 52rem 4rem;
     grid-template-areas:
-                        "player1 toGo1 score toGo2 player2"
-                        "player1 game game game player2"
+                        "scorer1 toGo1 score toGo2 scorer2"
+                        "scorer1 game game game scorer2"
                         "navi navi navi navi navi"
                         ;
     background-color: black;
@@ -460,19 +500,77 @@ body.xoi{
     }
     .player{
       background-color: $bgcolor;
-      margin-bottom: $line/2;
+      margin-bottom: calc($line/2);
+
+      &.team{
+        $anim: 0.3s linear;
+        .images{
+          position: relative;
+          left: 0;
+          top: 0;
+          width: 100%;
+          padding-bottom: 128.5714286%;
+          background-color: #737373;
+          img{
+            transform: translate(24%,0) scale(0.42);
+            position: absolute;
+            left: 0;
+            top: 0;
+            transition: transform $anim, box-shadow $anim, z-index $anim;
+            z-index: 10;
+            box-shadow: 0.6rem 0.6rem 0.6rem rgba(0, 0, 0, 0.4);
+          }
+          img:nth-child(1){
+            transform: translate(-24%,0) scale(0.42);
+          }
+          img:nth-child(1).inactive{
+            transform: translate(-25%,25%) scale(0.35);
+          }
+          img.inactive{
+            transform: translate(25%,25%) scale(0.35);
+          }
+          img.active{
+            box-shadow: 0rem 0rem 0rem #000;
+            transform: scale(1);
+            z-index: 1;
+          }
+        }
+        .titles{
+          display: grid;
+          & > *{
+            grid-column: 1;
+            grid-row: 1;
+          }
+          .title{
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            
+            h2, h3{
+              opacity: 0;
+            }
+            &.active{
+              h2, h3{
+                transition: opacity $anim;
+                opacity: 1;
+              }
+            }
+          }
+        }
+      }
 
-      &.player1{
-        grid-area: player1;
+      &.scorer1{
+        grid-area: scorer1;
       }
-      &.player2{
-        grid-area: player2;
+      &.scorer2{
+        grid-area: scorer2;
       }
       img{
         width: 100%;
         aspect-ratio: 35/45;
         object-fit: cover;
       }
+
       h2, h3{
         text-align: center;
         margin: 0.2em;
@@ -524,8 +622,6 @@ body.xoi{
           background: white;
           color: black;
           margin: 0 0 $line $line;
-          width: calc(100% - $line);
-          height: calc(100% - $line);
           border: 0.15em transparent solid;
           display: flex;
           justify-content: center;
@@ -541,17 +637,17 @@ body.xoi{
             color: white;
             text-shadow: $text-shadow;
           }
-          &.player1.points{
+          &.scorer1.points{
             grid-column: 1;
           }
-          &.player1.toGo{
+          &.scorer1.toGo{
             grid-column: 2;
             font-size: 1.6rem;
           }
-          &.player2.points{
+          &.scorer2.points{
             grid-column: 4;
           }
-          &.player2.toGo{
+          &.scorer2.toGo{
             grid-column: 5;
             margin-right: $line;
             // width: calc(100% - 2*$line);
@@ -586,7 +682,7 @@ body.xoi{
     .nav{
       grid-area: navi;
       background-color: $bgcolor;
-      margin-top: $line/2;
+      margin-top: calc($line/2);
       display: flex;
       justify-content: space-evenly;
       align-items: center;
diff --git a/assets/css/style.min.css b/assets/css/style.min.css
index b852581..bc7ee9e 100644
--- a/assets/css/style.min.css
+++ b/assets/css/style.min.css
@@ -1 +1 @@
-html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0}@font-face{font-display:swap;font-family:'Open Sans';font-style:normal;font-weight:300;src:url("../fonts/opensans/open-sans-v40-latin-300.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:italic;font-weight:300;src:url("../fonts/opensans/open-sans-v40-latin-300italic.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:normal;font-weight:400;src:url("../fonts/opensans/open-sans-v40-latin-regular.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:italic;font-weight:400;src:url("../fonts/opensans/open-sans-v40-latin-italic.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:normal;font-weight:500;src:url("../fonts/opensans/open-sans-v40-latin-500.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:italic;font-weight:500;src:url("../fonts/opensans/open-sans-v40-latin-500italic.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:normal;font-weight:600;src:url("../fonts/opensans/open-sans-v40-latin-600.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:italic;font-weight:600;src:url("../fonts/opensans/open-sans-v40-latin-600italic.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:normal;font-weight:700;src:url("../fonts/opensans/open-sans-v40-latin-700.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:italic;font-weight:700;src:url("../fonts/opensans/open-sans-v40-latin-700italic.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:normal;font-weight:800;src:url("../fonts/opensans/open-sans-v40-latin-800.woff2") format("woff2")}@font-face{font-display:swap;font-family:'Open Sans';font-style:italic;font-weight:800;src:url("../fonts/opensans/open-sans-v40-latin-800italic.woff2") format("woff2")}*{box-sizing:border-box;margin:0;padding:0}:root{font-size:Min(1.11111vw, 1.48148vh)}body{margin:0;font-family:"Open Sans";background-color:black;display:flex;justify-content:center;align-items:center;height:100vh;color:white;display:flex;flex-direction:column;overflow:hidden}input{font-family:"Open Sans"}main{border-left:0.2rem solid black;border-right:0.2rem solid black;height:67.5rem;width:90rem;background-color:#2f6f2a;display:flex;flex-direction:column}h1,h2,h3,h4,h5,h6{font-weight:bold}.game .body{height:48rem}.center{display:flex;justify-content:center}.hidden{display:none !important}.label{font-size:1.8em;padding:0.3em 0;font-weight:bold;display:block}.overlay{border-radius:0.25em;border:0.3em black solid;position:absolute;top:50%;left:50%;z-index:1000;transform:translate(-50%, -50%);width:45rem;max-height:60rem;overflow-y:auto;background-color:#2f6f2a;padding:2em 1.7em}.overlay::-webkit-scrollbar{width:0}.dialog{flex-grow:1;display:flex;flex-direction:column;justify-content:center;align-items:center;width:auto}.dialog h2{font-size:2.4em;margin-bottom:0.5em;text-shadow:0.2rem 0.2rem 0.4rem #000}.dialog p{font-size:1.4em;margin-bottom:1em;text-shadow:0.2rem 0.2rem 0.4rem #000}body.home header{display:flex;justify-content:center;align-items:center;height:42%}body.home header>img{display:block;width:50%;height:auto}body.home h1{text-align:center;color:white;font-size:2.6rem;text-shadow:0.2rem 0.2rem 0.4rem #000}body.home .menu{flex-grow:1;display:flex;align-items:center;padding-bottom:7.5rem}body.home .menu .mainmenu{width:100%;display:flex;align-items:center;flex-direction:column;justify-content:center}body.home .menu .mainmenu h1{margin-bottom:1em}nav.list{display:flex;justify-content:center;flex-grow:1}nav.list.horizontal{flex-direction:row;justify-content:space-evenly}nav.list.horizontal>*+*{margin-left:1em}nav.list.vertical{flex-direction:column}nav.list.vertical>*+*{margin-top:1em}.element{border-radius:0.25em;border:0.3em black solid;border-width:0.3rem;background-color:#214d1d;cursor:pointer}.element:focus,.element:hover{outline:none;border-color:orange}.element.input{font-size:2em;padding:0.3em;background-color:white;color:black;display:block;width:100%}.element.player{display:flex;justify-content:flex-start;align-items:center;padding:0.7em}.element.player h2{font-size:1.3em}.element.player>*{margin-right:1em}.element.player img{height:3em;aspect-ratio:1/1;object-position:top;object-fit:cover}.element.plain{color:white;font-weight:bold;padding:0.3em 0.5em;text-align:center;display:flex;align-items:flex-end;text-shadow:0.2rem 0.2rem 0.4rem #000;font-family:"Open Sans";padding:1rem 2rem;justify-content:center;align-items:center;box-shadow:0.25rem 0.25rem 1rem rgba(0,0,0,0.3);font-size:1.6em}.element.plain:hover,.element.plain:focus{background-color:rgba(0,0,0,0.2);border-color:orange;outline:none}.element.plain.back{background-color:#5E716A}.element.plain.new{background-color:#193a16}.element.player{height:4.5em}.element.square{font-size:1rem;width:20em;height:20em;padding:2.5em 1.25em;display:flex;flex-direction:column;justify-content:center;align-items:center;background-color:#214d1d;box-shadow:0.25em 0.25em 1em rgba(0,0,0,0.3);cursor:pointer}.element.square h2{color:white;font-weight:bold;padding:0.3em 0.5em;text-align:center;display:flex;align-items:flex-end;text-shadow:0.2rem 0.2rem 0.4rem #000;font-family:"Open Sans";font-size:2em;padding:0.6em 0 0 0}.element.square:hover,.element.square:focus{background-color:rgba(0,0,0,0.2);border-color:orange;outline:none}.element.square .icon{width:65%;height:auto}.element.square .icon svg{width:100%;aspect-ratio:1/1;object-fit:cover;fill:white;filter:drop-shadow(0.2rem 0.2rem 0.4rem #000)}.element.square .icon img{width:100%;aspect-ratio:1/1;object-fit:cover;object-position:top;filter:drop-shadow(0.2rem 0.2rem 0.4rem #000)}body.xoi main{display:flex;justify-content:center}body.xoi main .gamesetup{width:65%;margin:0 auto}body.xoi main .gamesetup h1{font-size:3em;text-align:center;margin-bottom:0.5em}body.xoi main .gamesetup .menu>*{margin-bottom:1.3em}body.xoi main .playerselect>h2{font-size:1.8em;margin-bottom:0.7em;text-align:center}body.xoi main .xoi{display:grid;height:100%;grid-template-columns:3fr 3fr 2fr 3fr 3fr;grid-template-rows:11.5rem 52rem 4rem;grid-template-areas:"player1 toGo1 score toGo2 player2" "player1 game game game player2" "navi navi navi navi navi";background-color:black}body.xoi main .xoi .bigToGo{margin:.2rem;background-color:white;border:0.7rem solid black;color:black;font-weight:bold;font-size:7.5em;display:flex;justify-content:center;align-items:center}body.xoi main .xoi .bigToGo.active{border-color:orange}body.xoi main .xoi .bigToGo.one{grid-area:toGo1}body.xoi main .xoi .bigToGo.two{grid-area:toGo2}body.xoi main .xoi .score{margin:.2rem 0;grid-area:score;color:white;text-shadow:0.1rem 0.1rem 0.2rem rgba(0,0,0,0.8);background-color:#2f6f2a;display:flex;flex-direction:column;justify-content:space-evenly}body.xoi main .xoi .score>div{display:flex;justify-content:space-evenly;align-items:center}body.xoi main .xoi .score>div h2,body.xoi main .xoi .score>div h3{margin:0;text-align:center;font-size:1.3rem}body.xoi main .xoi .score>div h3{font-size:1.1rem}body.xoi main .xoi .score>div>h2{font-size:3.2rem}body.xoi main .xoi .score>div h2:nth-child(2){order:10}body.xoi main .xoi .player{background-color:#2f6f2a;margin-bottom:.1rem}body.xoi main .xoi .player.player1{grid-area:player1}body.xoi main .xoi .player.player2{grid-area:player2}body.xoi main .xoi .player img{width:100%;aspect-ratio:35/45;object-fit:cover}body.xoi main .xoi .player h2,body.xoi main .xoi .player h3{text-align:center;margin:0.2em;text-shadow:0.1rem 0.1rem 0.2rem rgba(0,0,0,0.8)}body.xoi main .xoi .player h2{font-size:1.8em}body.xoi main .xoi .player h3{font-size:1.2em}body.xoi main .xoi .player .stats{display:grid;grid-template-columns:auto 1fr 1fr 1fr;grid-auto-rows:auto;margin:1em 0.6em;text-shadow:0.1rem 0.1rem 0.2rem rgba(0,0,0,0.8)}body.xoi main .xoi .player .stats .row{display:contents;font-size:1.4em}body.xoi main .xoi .player .stats .row.header{font-weight:bold}body.xoi main .xoi .player .stats .row :nth-child(2),body.xoi main .xoi .player .stats .row :nth-child(3),body.xoi main .xoi .player .stats .row :nth-child(4){text-align:center}body.xoi main .xoi .game{grid-area:game;display:grid;grid-template-columns:1fr;grid-template-rows:4.72727272rem 47.272727273rem}body.xoi main .xoi .game>div{display:grid;grid-template-columns:4fr 4fr 2fr 4fr 4fr;grid-auto-rows:4.72727272rem;overflow-y:scroll;grid-auto-flow:dense;height:100%}body.xoi main .xoi .game>div::-webkit-scrollbar{width:0}body.xoi main .xoi .game>div>div{font-size:2rem;text-align:center;background:white;color:black;margin:0 0 .2rem .2rem;width:calc(100% - $line);height:calc(100% - $line);border:0.15em transparent solid;display:flex;justify-content:center;align-items:center}body.xoi main .xoi .game>div>div.headding{background-color:#2f6f2a;color:white;text-shadow:0.1rem 0.1rem 0.2rem rgba(0,0,0,0.8)}body.xoi main .xoi .game>div>div.rounds{grid-column:3;background-color:#2f6f2a;color:white;text-shadow:0.1rem 0.1rem 0.2rem rgba(0,0,0,0.8)}body.xoi main .xoi .game>div>div.player1.points{grid-column:1}body.xoi main .xoi .game>div>div.player1.toGo{grid-column:2;font-size:1.6rem}body.xoi main .xoi .game>div>div.player2.points{grid-column:4}body.xoi main .xoi .game>div>div.player2.toGo{grid-column:5;margin-right:.2rem;font-size:1.6rem}body.xoi main .xoi .game>div>div.input{padding:0;border:0.15em orange solid}body.xoi main .xoi .game>div>div.input input{text-align:center;box-sizing:border-box;font-family:inherit;padding:0.1em;border:none;width:100%;height:100%;font-size:1em}body.xoi main .xoi .game>div>div.input input:focus{outline:none}body.xoi main .xoi .game>div>div.headding.rounds{font-size:1.4rem}body.xoi main .xoi .nav{grid-area:navi;background-color:#2f6f2a;margin-top:.1rem;display:flex;justify-content:space-evenly;align-items:center}body.xoi main .xoi .nav span{font-size:2em}
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:"";content:none}table{border-collapse:collapse;border-spacing:0}@font-face{font-display:swap;font-family:"Open Sans";font-style:normal;font-weight:300;src:url("../fonts/opensans/open-sans-v40-latin-300.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:italic;font-weight:300;src:url("../fonts/opensans/open-sans-v40-latin-300italic.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:normal;font-weight:400;src:url("../fonts/opensans/open-sans-v40-latin-regular.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:italic;font-weight:400;src:url("../fonts/opensans/open-sans-v40-latin-italic.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:normal;font-weight:500;src:url("../fonts/opensans/open-sans-v40-latin-500.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:italic;font-weight:500;src:url("../fonts/opensans/open-sans-v40-latin-500italic.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:normal;font-weight:600;src:url("../fonts/opensans/open-sans-v40-latin-600.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:italic;font-weight:600;src:url("../fonts/opensans/open-sans-v40-latin-600italic.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:normal;font-weight:700;src:url("../fonts/opensans/open-sans-v40-latin-700.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:italic;font-weight:700;src:url("../fonts/opensans/open-sans-v40-latin-700italic.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:normal;font-weight:800;src:url("../fonts/opensans/open-sans-v40-latin-800.woff2") format("woff2")}@font-face{font-display:swap;font-family:"Open Sans";font-style:italic;font-weight:800;src:url("../fonts/opensans/open-sans-v40-latin-800italic.woff2") format("woff2")}*{box-sizing:border-box;margin:0;padding:0}:root{font-size:min(1.111111111vw,1.481481481vh)}body{margin:0;font-family:"Open Sans";background-color:#000;display:flex;justify-content:center;align-items:center;height:100vh;color:#fff;display:flex;flex-direction:column;overflow:hidden}input{font-family:"Open Sans"}main{border-left:.2rem solid #000;border-right:.2rem solid #000;height:67.5rem;width:90rem;background-color:#2f6f2a;display:flex;flex-direction:column}h1,h2,h3,h4,h5,h6{font-weight:bold}.game .body{height:48rem}.center{display:flex;justify-content:center}.hidden{display:none !important}.label{font-size:1.8em;padding:.3em 0;font-weight:bold;display:block}.overlay{border-radius:.5rem;border:.3rem #000 solid;position:absolute;top:50%;left:50%;z-index:1000;transform:translate(-50%, -50%);width:45rem;max-height:60rem;overflow-y:auto;background-color:#2f6f2a;padding:2em 1.7em}.overlay::-webkit-scrollbar{width:0}.dialog{flex-grow:1;display:flex;flex-direction:column;justify-content:center;align-items:center;width:auto}.dialog h2{font-size:2.4em;margin-bottom:.5em;text-shadow:.2rem .2rem .4rem #000}.dialog p{font-size:1.4em;margin-bottom:1em;text-shadow:.2rem .2rem .4rem #000}nav.list{display:flex;justify-content:center;flex-grow:1;width:100%}nav.list.horizontal{flex-direction:row;justify-content:space-evenly}nav.list.horizontal>*+*{margin-left:1em}nav.list.vertical{flex-direction:column}nav.list.vertical>*+*{margin-top:1em}.element{border-radius:.5rem;border:.3rem #000 solid;border-width:.3rem;background-color:#214d1d;cursor:pointer;box-shadow:.25rem .25rem 1rem rgba(0,0,0,.3)}.element:focus,.element:hover{outline:none;border-color:orange}.element.input{font-size:2em;padding:.3em;background-color:#fff;color:#000;display:block;width:100%}.element.player{display:flex;justify-content:flex-start;align-items:center;padding:.7em;height:4.5em}.element.player h2{font-size:1.3em}.element.player>*{margin-right:1em}.element.player img{height:3em;aspect-ratio:1/1;object-position:top;object-fit:cover}.element.scorer{color:#fff;font-weight:bold;padding:.3em .5em;text-align:center;display:flex;align-items:flex-end;text-shadow:.2rem .2rem .4rem #000;font-family:"Open Sans";display:flex;justify-content:flex-start;align-items:center;padding:.7em;height:4.5em}.element.scorer .player{display:flex;justify-content:flex-start;align-items:center;min-width:0;flex-basis:0;flex-grow:1;text-align:left}.element.scorer .player h2{font-size:1.3em}.element.scorer .player>*{margin-right:1em}.element.scorer .player img{height:3em;aspect-ratio:1/1;object-position:top;object-fit:cover}.element.plain{color:#fff;font-weight:bold;padding:.3em .5em;text-align:center;display:flex;align-items:flex-end;text-shadow:.2rem .2rem .4rem #000;font-family:"Open Sans";padding:1rem 2rem;justify-content:center;align-items:center;font-size:1.6em}.element.plain:hover,.element.plain:focus{background-color:rgba(0,0,0,.2);border-color:orange;outline:none}.element.plain.back{background-color:#5e716a}.element.plain.new{background-color:#193a16}.element.square{font-size:1rem;width:20em;height:20em;padding:2.5em 1.25em;display:flex;flex-direction:column;justify-content:center;align-items:center;background-color:#214d1d;box-shadow:.25em .25em 1em rgba(0,0,0,.3);cursor:pointer}.element.square h2{color:#fff;font-weight:bold;padding:.3em .5em;text-align:center;display:flex;align-items:flex-end;text-shadow:.2rem .2rem .4rem #000;font-family:"Open Sans";font-size:2em;padding:.6em 0 0 0}.element.square:hover,.element.square:focus{background-color:rgba(0,0,0,.2);border-color:orange;outline:none}.element.square .icon{width:65%;height:auto}.element.square .icon svg{width:100%;aspect-ratio:1/1;object-fit:cover;fill:#fff;filter:drop-shadow(0.2rem 0.2rem 0.4rem #000)}.element.square .icon img{width:100%;aspect-ratio:1/1;object-fit:cover;object-position:top;filter:drop-shadow(0.2rem 0.2rem 0.4rem #000)}body.home header{display:flex;justify-content:center;align-items:center;height:42%}body.home header>img{display:block;width:50%;height:auto}body.home h1{text-align:center;color:#fff;font-size:2.6rem;text-shadow:.2rem .2rem .4rem #000}body.home .menu{flex-grow:1;display:flex;align-items:center;padding-bottom:7.5rem}body.home .menu .mainmenu{width:60%;margin:0 auto;display:flex;align-items:center;flex-direction:column;justify-content:center}body.home .menu .mainmenu h1{margin-bottom:1em}body.xoi main{display:flex;justify-content:center}body.xoi main .gamesetup{width:65%;margin:0 auto}body.xoi main .gamesetup h1{font-size:3em;text-align:center;margin-bottom:.5em}body.xoi main .gamesetup .menu>*{margin-bottom:1.3em}body.xoi main .playerselect>h2{font-size:1.8em;margin-bottom:.7em;text-align:center}body.xoi main .xoi{display:grid;height:100%;grid-template-columns:3fr 3fr 2fr 3fr 3fr;grid-template-rows:11.5rem 52rem 4rem;grid-template-areas:"scorer1 toGo1 score toGo2 scorer2" "scorer1 game game game scorer2" "navi navi navi navi navi";background-color:#000}body.xoi main .xoi .bigToGo{margin:.2rem;background-color:#fff;border:.7rem solid #000;color:#000;font-weight:bold;font-size:7.5em;display:flex;justify-content:center;align-items:center}body.xoi main .xoi .bigToGo.active{border-color:orange}body.xoi main .xoi .bigToGo.one{grid-area:toGo1}body.xoi main .xoi .bigToGo.two{grid-area:toGo2}body.xoi main .xoi .score{margin:.2rem 0;grid-area:score;color:#fff;text-shadow:.1rem .1rem .2rem rgba(0,0,0,.8);background-color:#2f6f2a;display:flex;flex-direction:column;justify-content:space-evenly}body.xoi main .xoi .score>div{display:flex;justify-content:space-evenly;align-items:center}body.xoi main .xoi .score>div h2,body.xoi main .xoi .score>div h3{margin:0;text-align:center;font-size:1.3rem}body.xoi main .xoi .score>div h3{font-size:1.1rem}body.xoi main .xoi .score>div>h2{font-size:3.2rem}body.xoi main .xoi .score>div h2:nth-child(2){order:10}body.xoi main .xoi .player{background-color:#2f6f2a;margin-bottom:.1rem}body.xoi main .xoi .player.team .images{position:relative;left:0;top:0;width:100%;padding-bottom:128.5714286%;background-color:#737373}body.xoi main .xoi .player.team .images img{transform:translate(24%, 0) scale(0.42);position:absolute;left:0;top:0;transition:transform .3s linear,box-shadow .3s linear,z-index .3s linear;z-index:10;box-shadow:.6rem .6rem .6rem rgba(0,0,0,.4)}body.xoi main .xoi .player.team .images img:nth-child(1){transform:translate(-24%, 0) scale(0.42)}body.xoi main .xoi .player.team .images img:nth-child(1).inactive{transform:translate(-25%, 25%) scale(0.35)}body.xoi main .xoi .player.team .images img.inactive{transform:translate(25%, 25%) scale(0.35)}body.xoi main .xoi .player.team .images img.active{box-shadow:0rem 0rem 0rem #000;transform:scale(1);z-index:1}body.xoi main .xoi .player.team .titles{display:grid}body.xoi main .xoi .player.team .titles>*{grid-column:1;grid-row:1}body.xoi main .xoi .player.team .titles .title{display:flex;flex-direction:column;justify-content:center}body.xoi main .xoi .player.team .titles .title h2,body.xoi main .xoi .player.team .titles .title h3{opacity:0}body.xoi main .xoi .player.team .titles .title.active h2,body.xoi main .xoi .player.team .titles .title.active h3{transition:opacity .3s linear;opacity:1}body.xoi main .xoi .player.scorer1{grid-area:scorer1}body.xoi main .xoi .player.scorer2{grid-area:scorer2}body.xoi main .xoi .player img{width:100%;aspect-ratio:35/45;object-fit:cover}body.xoi main .xoi .player h2,body.xoi main .xoi .player h3{text-align:center;margin:.2em;text-shadow:.1rem .1rem .2rem rgba(0,0,0,.8)}body.xoi main .xoi .player h2{font-size:1.8em}body.xoi main .xoi .player h3{font-size:1.2em}body.xoi main .xoi .player .stats{display:grid;grid-template-columns:auto 1fr 1fr 1fr;grid-auto-rows:auto;margin:1em .6em;text-shadow:.1rem .1rem .2rem rgba(0,0,0,.8)}body.xoi main .xoi .player .stats .row{display:contents;font-size:1.4em}body.xoi main .xoi .player .stats .row.header{font-weight:bold}body.xoi main .xoi .player .stats .row :nth-child(2),body.xoi main .xoi .player .stats .row :nth-child(3),body.xoi main .xoi .player .stats .row :nth-child(4){text-align:center}body.xoi main .xoi .game{grid-area:game;display:grid;grid-template-columns:1fr;grid-template-rows:4.72727272rem 47.272727273rem}body.xoi main .xoi .game>div{display:grid;grid-template-columns:4fr 4fr 2fr 4fr 4fr;grid-auto-rows:4.72727272rem;overflow-y:scroll;grid-auto-flow:dense;height:100%}body.xoi main .xoi .game>div::-webkit-scrollbar{width:0}body.xoi main .xoi .game>div>div{font-size:2rem;text-align:center;background:#fff;color:#000;margin:0 0 .2rem .2rem;border:.15em rgba(0,0,0,0) solid;display:flex;justify-content:center;align-items:center}body.xoi main .xoi .game>div>div.headding{background-color:#2f6f2a;color:#fff;text-shadow:.1rem .1rem .2rem rgba(0,0,0,.8)}body.xoi main .xoi .game>div>div.rounds{grid-column:3;background-color:#2f6f2a;color:#fff;text-shadow:.1rem .1rem .2rem rgba(0,0,0,.8)}body.xoi main .xoi .game>div>div.scorer1.points{grid-column:1}body.xoi main .xoi .game>div>div.scorer1.toGo{grid-column:2;font-size:1.6rem}body.xoi main .xoi .game>div>div.scorer2.points{grid-column:4}body.xoi main .xoi .game>div>div.scorer2.toGo{grid-column:5;margin-right:.2rem;font-size:1.6rem}body.xoi main .xoi .game>div>div.input{padding:0;border:.15em orange solid}body.xoi main .xoi .game>div>div.input input{text-align:center;box-sizing:border-box;font-family:inherit;padding:.1em;border:none;width:100%;height:100%;font-size:1em}body.xoi main .xoi .game>div>div.input input:focus{outline:none}body.xoi main .xoi .game>div>div.headding.rounds{font-size:1.4rem}body.xoi main .xoi .nav{grid-area:navi;background-color:#2f6f2a;margin-top:.1rem;display:flex;justify-content:space-evenly;align-items:center}body.xoi main .xoi .nav span{font-size:2em}
\ No newline at end of file
diff --git a/assets/js/components/init.js b/assets/js/components/init.js
index e1d9041..45bb1f3 100644
--- a/assets/js/components/init.js
+++ b/assets/js/components/init.js
@@ -1,11 +1,11 @@
 import list from "./list.js";
 
 import playerElem from "./playerElem.js";
+import scorerElem from "./scorerElem.js";
 import plainElem from "./plainElem.js";
 import squareElem from "./squareElem.js";
 import inputElem from "./inputElem.js";
 
-import playerSelect from "./playerSelect.js";
 import select from "./select.js";
 // import overlay from "./overlay.js";
 import dialog from "./dialog.js";
@@ -14,11 +14,11 @@ export default (app) => {
   app.component("d-list", list);
 
   app.component("d-playerElem", playerElem);
+  app.component("d-scorerElem", scorerElem);
   app.component("d-plainElem", plainElem);
   app.component("d-squareElem", squareElem);
   app.component("d-inputElem", inputElem);
   app.component("d-select", select);
-
-  app.component("d-playerSelect", playerSelect);
+  
   app.component("d-dialog", dialog);
 }
diff --git a/assets/js/components/list.js b/assets/js/components/list.js
index e5589ad..ae0cfda 100644
--- a/assets/js/components/list.js
+++ b/assets/js/components/list.js
@@ -4,11 +4,12 @@ import { getId } from "../handlers.js";
 const html = (v) => { return v[0] };
 
 export default {
-  props: ['elements', 'type', "withshortkey"],
+  props: ['elements', 'title', 'type', "withshortkey"],
   setup(props) {
     return { }
   },
   template: html`
+    <h2 v-if="!!title">{{ title }}</h2>
     <nav class="list" :class="{ horizontal: type == 'horizontal', vertical: type != 'horizontal'}">
       <component :is="item.component" v-for="(item, index) in elements" v-index  :withshortkey="withshortkey"  @click="item.onClick" v-bind="item.props">
       </component>
diff --git a/assets/js/components/scorerElem.js b/assets/js/components/scorerElem.js
new file mode 100644
index 0000000..b8666a9
--- /dev/null
+++ b/assets/js/components/scorerElem.js
@@ -0,0 +1,40 @@
+import { onMounted, ref, computed, watch, nextTick } from "vue";
+
+const html = (v) => { return v[0] };
+
+export default {
+  props: ['scorer', 'id'],
+  setup(props) {
+    return {  }
+  },
+  template: html`
+    <div class="scorer element">
+      <div class="player" v-if="scorer === undefined">
+        <h2 class="name">No Player</h2>
+        <h3 class="nickname">&nbsp;</h3>
+      </div>  
+      <div class="player" v-if="scorer !== undefined">
+        <template v-if="scorer.member[0] !== undefined">
+          <img :src="scorer.member[0].img ? scorer.member[0].img : '/assets/img/placeholder_person.png'">
+          <h2 class="name">{{ scorer.member[0].forename }} {{ scorer.member[0].surname }}</h2>
+          <!-- <h3 class="nickname">{{ scorer.member[0].nickname }}</h3> -->
+        </template>
+        <template v-if="scorer.member[0] === undefined">
+        <h2 class="name">No Player</h2>
+        <h3 class="nickname">&nbsp;</h3>
+        </template>
+      </div>
+      <div class="player" v-if="scorer !== undefined && scorer.member[1] !== undefined">
+        <template v-if="scorer.member[1] !== undefined">
+          <img :src="scorer.member[1].img ? scorer.member[1].img : '/assets/img/placeholder_person.png'">
+          <h2 class="name">{{ scorer.member[1].forename }} {{ scorer.member[1].surname }}</h2>
+          <!-- <h3 class="nickname">{{ scorer.member[1].nickname }}</h3> -->
+        </template>
+        <template v-if="scorer.member[1] === undefined">
+          <h2 class="name">No Player</h2>
+          <h3 class="nickname">&nbsp;</h3>
+        </template>
+      </div>
+    </div>
+  `
+}
diff --git a/assets/js/components/select.js b/assets/js/components/select.js
index cb63f04..009ec32 100644
--- a/assets/js/components/select.js
+++ b/assets/js/components/select.js
@@ -3,15 +3,21 @@ import { handleActive, ArrowVerticalKeyHandler, ArrowHorizontalKeyHandler, Numbe
 
 const html = (v) => { return v[0] };
 
+const mappings = {
+  "player": ["d-playerElem", (p) => {return {"player": p} }],
+  "scorer": ["d-scorerElem", (p) => {return {"scorer": p} }],
+  "plain": ["d-plainElem", (p) => {return {"text": p} }],
+}
+
 export default {
-  props:  ['options', 'title', 'stack', 'active', 'input'],
+  props:  ['options', 'type', 'title', 'stack', 'active', 'input'],
   setup(props, context) {
-    handleActive(props, [ArrowVerticalKeyHandler]);
+    handleActive(props, [ArrowVerticalKeyHandler, NumberKeyHandler]);
     const children = computed(() => {
       return props.options.map((o) => {
         return {
-          component: "d-plainElem",
-          props: {"text": o},
+          component: props.type ? mappings[props.type][0] : "d-plainElem",
+          props: props.type ? mappings[props.type][1](o) : {"text": o},
           onClick: () => {
             context.emit('resolve', o);
           }
diff --git a/assets/js/components/teamElem.js b/assets/js/components/teamElem.js
new file mode 100644
index 0000000..edf14f9
--- /dev/null
+++ b/assets/js/components/teamElem.js
@@ -0,0 +1,36 @@
+import { onMounted, ref, computed, watch, nextTick } from "vue";
+
+const html = (v) => { return v[0] };
+
+export default {
+  props: ['team', 'id'],
+  setup(props) {
+    return {  }
+  },
+  template: html`
+    <div class="team element">
+      <div class="player">
+        <template v-if="team.member[0] !== undefined">
+          <img :src="team.member[0].img ? team.member[0].img : '/assets/img/placeholder_person.png'">
+          <h2 class="name">{{ team.member[0].forename }} {{ team.member[0].surname }}</h2>
+          <!-- <h3 class="nickname">{{ team.member[0].nickname }}</h3> -->
+        </template>
+        <template v-if="team.member[0] === undefined">
+        <h2 class="name">No Player</h2>
+        <h3 class="nickname">&nbsp;</h3>
+        </template>
+      </div>
+      <div class="player">
+        <template v-if="team.member[1] !== undefined">
+          <img :src="team.member[1].img ? team.member[1].img : '/assets/img/placeholder_person.png'">
+          <h2 class="name">{{ team.member[1].forename }} {{ team.member[1].surname }}</h2>
+          <!-- <h3 class="nickname">{{ team.member[1].nickname }}</h3> -->
+        </template>
+        <template v-if="team.member[1] === undefined">
+          <h2 class="name">No Player</h2>
+          <h3 class="nickname">&nbsp;</h3>
+        </template>
+      </div>
+    </div>
+  `
+}
diff --git a/assets/js/views/home.js b/assets/js/views/home.js
index ecccc05..fdc54ff 100644
--- a/assets/js/views/home.js
+++ b/assets/js/views/home.js
@@ -100,7 +100,7 @@ export const selectGame = {
         items.push({
           component: "d-plainElem",
           props: {
-            text: game.player[0]?.forename + " vs. " + game.player[1]?.forename,
+            text: game.scorers[0]?.member[0]?.forename + " vs. " + game.scorers[1]?.member[0]?.forename,
           },
           onClick: () => {
             emit("resolve", game.id);
@@ -164,15 +164,24 @@ const stateMachine = (stack) => {
         return [2, result];
     },
     2: async (input, reGet) => {
+        const playerInfo = {
+          forename: "page.forename",
+          surname: "page.surname",
+          uuid: "page.uuid",
+          // img: "page.pic.toFile?.thumbnail(350).url"
+        };
         const games = await getQuery(`site.find('${input}').getRunningGames`, {
           select: {
             title: "page.title",
             id: "page.id",
             uuid: "page.uuid",
-            player: {
-              query: "page.players.toPages",
-              select:{
-                forename: "page.forename"
+            scorers: {
+              query: "page.scorers.toStructure",
+              select: {
+                member: {
+                  query: "structureItem.member.toPages",
+                  select: playerInfo
+                }
               }
             }
           }
diff --git a/assets/js/views/xoi/logic.js b/assets/js/views/xoi/logic.js
index 8d215d0..d4d0950 100644
--- a/assets/js/views/xoi/logic.js
+++ b/assets/js/views/xoi/logic.js
@@ -1,5 +1,9 @@
 import { computed } from "vue";
 
+/////////////////////////////////////////
+// Helper
+/////////////////////////////////////////
+
 function setPoints(page, set){
   let points = [0, 0]; // need to get updated for more player
   let ret;
@@ -40,157 +44,6 @@ function legPoints(page, set, leg){
   return points;
 }
 
-export const getFinalWinner = (page) => {
-  const points = setPoints(page, page.sets[page.sets.length-1]);
-  return getWinner(points, page.sets);
-};
-
-export function getGameProps(page, current_set, current_leg) {
-  const ret = {};
-
-  if (current_set === undefined) {
-    current_set = computed(() => {
-      if (page.game != undefined) {
-        return page.game.sets[page.game.sets.length - 1]
-      }
-      return undefined;
-    });
-  }
-  ret.current_set = current_set;
-
-
-  if (current_leg === undefined) {
-    current_leg = computed(() => {
-
-      if (current_set.value != undefined) {
-        return current_set.value.legs[current_set.value.legs.length - 1]
-      }
-      return undefined;
-    });
-  }
-  ret.current_leg = current_leg;
-
-  const current_toGo = computed(() => {
-    if (current_leg.value != undefined) {
-      if (current_leg.value.visits.length < 2) {
-        return [page.modus, page.modus]
-      } else {
-        const end = current_leg.value.visits[current_leg.value.visits.length - 1].toGo;
-        if (end) return end;
-        return current_leg.value.visits[current_leg.value.visits.length - 2].toGo;
-      }
-    }
-    return [0, 0]; // need to get updated for more player
-  });
-  ret.current_toGo = current_toGo;
-
-
-
-  const current_set_points = computed(() => {
-    if (current_set.value != undefined) {
-      return setPoints(page, current_set.value);
-    }
-    return undefined;
-  });
-  ret.current_set_points = current_set_points;
-
-
-  const current_leg_points = computed(() => {
-    if (current_set.value != undefined || current_leg.value != undefined) {
-      return legPoints(page, current_set.value, current_leg.value);
-    }
-    return undefined;
-  });
-  ret.current_leg_points = current_leg_points;
-
-
-  const current_player = computed(() => {
-    if (current_leg.value != undefined) {
-      const len = current_leg.value.visits.length;
-      return current_leg.value.visits[len - 1].player == page.players[1].uuid;
-    }
-    return undefined;
-  });
-  ret.current_player = current_player;
-
-  const breaks = computed(() => {
-    let b = [0,0];
-    for (const j in page.game.sets) {
-      const set = page.game.sets[j];
-      for (const i in set.legs) {
-        const l = set.legs[i];
-        if (l.visits[l.visits.length-1].toGo === undefined) {
-          return b;
-        }
-        if (l.visits[l.visits.length-1].toGo[0] == 0 && i%2 == 1)
-          b[0] += 1;
-        else if (l.visits[l.visits.length-1].toGo[1] == 0 && i%2 == 0)
-          b[1] += 1;
-      }
-    }
-    return b;
-  });
-  ret.breaks = breaks;
-
-  const getVal = (tr) => {
-    const val = tr.trim();
-    if (val == "") {
-      return 0;
-    }
-    if (val == "SB") {
-      return 25;
-    }
-    if (val == "DB") {
-      return 50;
-    }
-    if (val[0] == "S" || val[0] == "O" || val[0] == "I") {
-      return parseFloat(val.substring(1));
-    }
-    if (val[0] == "D") {
-      return 2 * parseFloat(val.substring(1));
-    }
-    if (val[0] == "T") {
-      return 3 * parseFloat(val.substring(1));
-    }
-    if (val[0] == "M") {
-      return 0;
-    } else {
-      // TODO: Check for Na
-      return parseFloat(val);
-    }
-  }
-  const verifySum = (sum) => {
-    if (sum > 180 || [179, 178, 176, 175, 173, 172, 169, 166, 163].indexOf(sum) > -1) {
-      return -1;
-    } else if (current_toGo.value[current_player.value * 1] - sum < 0) {
-      return -2;
-    } if (current_toGo.value[current_player.value * 1] - sum == 0) {
-      // bogey numbers
-      if (page.out == "Double" && (sum > 170 || [169, 168, 166, 165, 163, 162, 159].indexOf(sum) > -1)) {
-        return -1;
-      }
-      return 0;
-    } else if (current_toGo.value[current_player.value * 1] - sum <= 50) {
-      return 1;
-    } else if (page.in != "Straight" && current_toGo.value[current_player.value * 1] == page.modus && sum != 0) {
-      return 3;
-    }
-    return 2;
-  }
-  const checkVisit = (throws) => {
-    const tr = throws.split(",");
-    let sum = 0;
-    tr.forEach((t, i) => {
-      sum += getVal(t);
-    });
-    const res = verifySum(sum);
-    return [res, sum];
-  }
-  ret.checkVisit = checkVisit;
-
-  return ret;
-}
-
 function newPlayerStats(player) {
   return {
     player: player.uuid,
@@ -207,36 +60,30 @@ function newPlayerStats(player) {
   };
 }
 
-function addNewSetStats(stats, players) {
-  stats["sets"].push(newStats(players));
+function addNewSetStats(stats, scorers) {
+  stats["sets"].push(newStats(scorers));
   stats["sets"][0]["legs"] = [];
   return stats;
 }
 
-function addNewLegStats(stats, players) {
-  stats["sets"].at(-1)["legs"].push(newStats(players));
+function addNewLegStats(stats, scorers) {
+  stats["sets"].at(-1)["legs"].push(newStats(scorers));
   return stats;
 }
 
-function newStats(players) {
+function newStats(scorers) {
   const stats = {
     stats: []
   }
-  players.forEach((player, i) => {
-    const n = newPlayerStats(player);
-    stats.stats.push(n);
+  scorers.forEach((scorer) => {
+    scorer.member.forEach((player) => {
+      const n = newPlayerStats(player);
+      stats.stats.push(n);
+    });
   });
   return stats;
 }
 
-export function initStats(page) {
-  const stats = newStats(page.players);
-  stats.sets = [];
-  addNewSetStats(stats, page.players);
-  addNewLegStats(stats, page.players);
-  page.stats = stats;
-}
-
 function newVisit(playerUUID, round) {
   return {
     player: playerUUID,
@@ -245,23 +92,101 @@ function newVisit(playerUUID, round) {
     checkoutTries: 0,
     checkinTries: 0,
     numDarts: 0,
-  };
+  }
+}
+
+function clearLastVisit(page){
+  const set = page.game.sets[page.game.sets.length-1];
+  const leg = set.legs[set.legs.length-1];
+  const visit = leg.visits[leg.visits.length-1];
+  const ret = visit["throws"];
+  visit["throws"] = [];
+  visit["checkoutTries"] = 0;
+  visit["checkinTries"] = 0;
+  visit["numDarts"] = 0;
+  delete visit["sum"];
+  delete visit["toGo"];
+  return ret;
+}
+
+function getWinner(points, mode) {
+  const sorted = [...points].map((e,i) => [e,i]).sort((a, b) => b[0] - a[0]);
+  const k = points.length;
+  const sum = points.reduce((a,c) => a+c, 0);
+  if (sum < mode && sorted[0][0] <= mode/k){
+    // not over yet
+    return -1;
+  }
+  if (sorted[0][0] == sorted[1][0]){
+    // Draw
+    return -2;
+  }
+  // winner id
+  return sorted[0][1];
+}
+
+function addNewSet(page){
+  const set = page.game.sets[page.game.sets.length-1];
+  const k = player2scorer(page)[set.legs[0].visits[0].player];
+  const p = page.scorers[(k+1)%2].member[0].uuid;
+  page.game.sets.push({
+    // points: [...points],
+    legs: [{
+        points: Array(2).fill(0),
+        visits: [newVisit(p, 1)]
+      }]
+  });
+}
+
+function addNewLeg(page){
+  const set = page.game.sets[page.game.sets.length-1];
+  const leg = set.legs[set.legs.length-1];
+  const k = player2scorer(page)[leg.visits[0].player];
+  console.log(k, k+1);
+  
+  const p = page.scorers[(k+1)%2].member[0].uuid;
+  page.game.sets[page.game.sets.length-1].legs.push({
+    // points: [...points],
+    visits: [newVisit(p, 1)]
+  });
+}
+
+
+/////////////////////////////////////////
+// Exports
+/////////////////////////////////////////
+
+export function playerFromUUID(uuid, players){
+  return players[players.map((p) => p.uuid).indexOf(uuid)];
+}
+
+export const getFinalWinner = (page) => {
+  const points = setPoints(page, page.sets[page.sets.length-1]);
+  return getWinner(points, page.sets);
+};
+
+export function initStats(page) {
+  const stats = newStats(page.scorers);
+  stats.sets = [];
+  addNewSetStats(stats, page.scorers);
+  addNewLegStats(stats, page.scorers);
+  page.stats = stats;
 }
 
 export function initGame(page) {
   page.game = {
     sets: [{
-      points: new Array(page.players.length).fill(0),
+      points: new Array(2).fill(0),
       legs: [{
-        points: new Array(page.players.length).fill(0),
-        visits: [newVisit(page.players[0].uuid, 1)]
+        points: new Array(2).fill(0),
+        visits: [newVisit(page.scorers[0].member[0].uuid, 1)]
       }]
     }]
   }
 }
 
 function updateStats(page, visit){
-  const playerUUIDs = page.players.map((p) => p.uuid);
+  const playerUUIDs = allPlayers(page).map((p) => p.uuid);
   const k = playerUUIDs.indexOf(visit.player);
 
   const todos = [page.stats["stats"][k]];
@@ -297,69 +222,43 @@ function updateStats(page, visit){
   });
 }
 
-function getWinner(points, mode) {
-  const sorted = [...points].map((e,i) => [e,i]).sort((a, b) => b[0] - a[0]);
-  const k = points.length;
-  const sum = points.reduce((a,c) => a+c, 0);
-  if (sum < mode && sorted[0][0] <= mode/k){
-    // not over yet
-    return -1;
-  }
-  if (sorted[0][0] == sorted[1][0]){
-    // Draw
-    return -2;
-  }
-  // winner id
-  return sorted[0][1];
-}
-
-export const formatDate = (d) => {
-  return `${d.getFullYear()}-${(d.getMonth()+1).toString().padStart(2, '0')}-${d.getDate().toString().padStart(2, '0')} ${d.getHours().toString().padStart(2, '0')}:${d.getMinutes().toString().padStart(2, '0')}`;
-};
-
-function addNewSet(page, points){
-  const playerUUIDs = page.players.map((p) => p.uuid);
+function getNextPlayer(page, visit) {
   const set = page.game.sets[page.game.sets.length-1];
   const leg = set.legs[set.legs.length-1];
-  const k = playerUUIDs.indexOf(set.legs[0].visits[0].player);
-  const p = playerUUIDs[(k+1)%playerUUIDs.length];
-  page.game.sets.push({
-    // points: [...points],
-    legs: [{
-        points: Array(playerUUIDs.length).fill(0),
-        visits: [newVisit(p, 1)]
-      }]
-  });
+
+  const offset = 1*(leg.visits[0].player == page.scorers[0].member[0].uuid);
+  const order = [];
+  for (let index = 0; index < page.scorers[0].member.length; index++) {
+    order.push(page.scorers[1-offset].member[index].uuid);
+    order.push(page.scorers[offset].member[index].uuid);
+  } 
+  const nextid = (order.indexOf(visit.player)+1);
+  return [order[nextid%order.length], (nextid == order.length)];
 }
 
-function addNewLeg(page){
-  const playerUUIDs = page.players.map((p) => p.uuid);
-  const set = page.game.sets[page.game.sets.length-1];
-  const leg = set.legs[set.legs.length-1];
-  const k = playerUUIDs.indexOf(leg.visits[0].player);
-  const p = playerUUIDs[(k+1)%playerUUIDs.length];
-  page.game.sets[page.game.sets.length-1].legs.push({
-    // points: [...points],
-    visits: [newVisit(p, 1)]
-  });
+export function player2scorer(page){
+  return Object.entries(page.scorers).reduce((result, [scorersId, scorer]) => {
+    // Use the map method to create an array of key-value pairs for each "member"
+    scorer.member.forEach(player => {
+      result[player.uuid] = parseInt(scorersId);
+    });
+    return result;
+  }, {});
 }
 
-function clearLastVisit(page){
-  const set = page.game.sets[page.game.sets.length-1];
-  const leg = set.legs[set.legs.length-1];
-  const visit = leg.visits[leg.visits.length-1];
-  const ret = visit["throws"];
-  visit["throws"] = [];
-  visit["checkoutTries"] = 0;
-  visit["checkinTries"] = 0;
-  visit["numDarts"] = 0;
-  delete visit["sum"];
-  delete visit["toGo"];
-  return ret;
+export function allPlayers(page){
+  return Object.entries(page.scorers).reduce((result, [scorersId, scorer]) => {
+    return result.concat(scorer.member);
+  }, []);
 }
 
+export const formatDate = (d) => {
+  return `${d.getFullYear()}-${(d.getMonth()+1).toString().padStart(2, '0')}-${d.getDate().toString().padStart(2, '0')} ${d.getHours().toString().padStart(2, '0')}:${d.getMinutes().toString().padStart(2, '0')}`;
+};
+
+
 export function recalcStats(page){
-  const set = page.game.sets[page.game.sets.length-1];
+  // const set = page.game.sets[page.game.sets.length-1];
   // const leg = set.legs[set.legs.length-1];
   // const visit = leg.visits[leg.visits.length-1];
   initStats(page);
@@ -373,11 +272,11 @@ export function recalcStats(page){
           updateStats(page, visit);
         }
         if (k == lastvisit && j != lastleg) {
-          addNewLegStats(page.stats, page.players);
+          addNewLegStats(page.stats, page.scorers);
         }
       });
       if (j == lastleg && i != lastset) {
-        addNewSetStats(page.stats, page.players);
+        addNewSetStats(page.stats, page.scorers);
       }
     });
   });
@@ -386,7 +285,7 @@ export function recalcStats(page){
 export function removeLastVisit(page){
   const set = page.game.sets[page.game.sets.length-1];
   const leg = set.legs[set.legs.length-1];
-  const visit = leg.visits[leg.visits.length-1];
+  // const visit = leg.visits[leg.visits.length-1];
 
   // delete last visit.
   leg["visits"].pop();
@@ -417,11 +316,10 @@ export function storeVisit(page, throws, sum, numDarts, outTries, inTries=0) {
   visit["checkinTries"] = inTries;
   visit["sum"] = sum
 
-  const playerUUIDs = page.players.map((p) => p.uuid);
-  const k = playerUUIDs.indexOf(visit["player"]);
+  const k = player2scorer(page)[visit["player"]];
   let toGo;
   if (leg["visits"].length-2 < 0) {
-    toGo = Array(playerUUIDs.length).fill(page.modus);
+    toGo = Array(2).fill(page.modus);
   } else {
     toGo = [...leg["visits"][leg["visits"].length-2]["toGo"]];
   }
@@ -441,8 +339,8 @@ export function storeVisit(page, throws, sum, numDarts, outTries, inTries=0) {
   let update = [];
   if (rest != 0) {
     // Normal case...next players turn
-    const nextPlayer = playerUUIDs[(k+1)%playerUUIDs.length];
-    const nVisit = newVisit(nextPlayer, visit["visit"]+1*(leg.visits[0]["player"] == nextPlayer));
+    const [nextPlayer, newRound] = getNextPlayer(page, visit);
+    const nVisit = newVisit(nextPlayer, visit["visit"]+1*newRound);
     leg.visits.push(nVisit);
   }
   else {
@@ -452,7 +350,7 @@ export function storeVisit(page, throws, sum, numDarts, outTries, inTries=0) {
     if (winner == -1) {
       // new Leg
       addNewLeg(page);
-      addNewLegStats(page.stats, page.players);
+      addNewLegStats(page.stats, page.scorers);
     } else {
       // new set?
       const newsetp = setPoints(page, set);
@@ -460,8 +358,8 @@ export function storeVisit(page, throws, sum, numDarts, outTries, inTries=0) {
       if (winner == -1) {
         // new Set
         addNewSet(page);
-        addNewSetStats(page.stats, page.players);
-        addNewLegStats(page.stats, page.players);
+        addNewSetStats(page.stats, page.scorers);
+        addNewLegStats(page.stats, page.scorers);
       } else {
         // ask for continue or game over
         if (winner == -2) {
@@ -490,8 +388,156 @@ export function endGame(page){
 export function extension(page){
   const set = page.game.sets[page.game.sets.length-1];
   const leg = set.legs[set.legs.length-1];
+  page.enddate = undefined;
   // leg["points"] = newlegp;
   // new Leg
   addNewLeg(page);
-  addNewLegStats(page.stats, page.players);
+  addNewLegStats(page.stats, page.scorers);
 }
+
+
+/////////////////////////////////////////
+// GameProps
+/////////////////////////////////////////
+
+export function getGameProps(page, current_set, current_leg) {
+  const ret = {};
+
+  if (current_set === undefined) {
+    current_set = computed(() => {
+      if (page.game != undefined) {
+        return page.game.sets[page.game.sets.length - 1]
+      }
+      return undefined;
+    });
+  }
+  ret.current_set = current_set;
+
+
+  if (current_leg === undefined) {
+    current_leg = computed(() => {      
+      if (current_set.value != undefined) {
+        return current_set.value.legs[current_set.value.legs.length - 1]
+      }
+      return undefined;
+    });
+  }
+  ret.current_leg = current_leg;
+
+  const current_toGo = computed(() => {
+    if (current_leg.value != undefined) {
+      if (current_leg.value.visits.length < 2) {
+        return [page.modus, page.modus]
+      } else {
+        const end = current_leg.value.visits[current_leg.value.visits.length - 1].toGo;
+        if (end) return end;
+        return current_leg.value.visits[current_leg.value.visits.length - 2].toGo;
+      }
+    }
+    return [0, 0]; // need to get updated for more player
+  });
+  ret.current_toGo = current_toGo;
+
+  const current_set_points = computed(() => {
+    if (current_set.value != undefined) {
+      return setPoints(page, current_set.value);
+    }
+    return undefined;
+  });
+  ret.current_set_points = current_set_points;
+
+  const current_leg_points = computed(() => {
+    if (current_set.value != undefined || current_leg.value != undefined) {
+      return legPoints(page, current_set.value, current_leg.value);
+    }
+    return undefined;
+  });
+  ret.current_leg_points = current_leg_points;
+
+  const current_scorer_idx = computed(() => {
+    if (current_leg.value != undefined) {
+      const len = current_leg.value.visits.length;
+      return player2scorer(page)[current_leg.value.visits[len - 1].player];
+    }
+    return undefined;
+  });
+  ret.current_scorer_idx = current_scorer_idx;
+
+  const breaks = computed(() => {
+    let b = [0,0];
+    for (const j in page.game.sets) {
+      const set = page.game.sets[j];
+      for (const i in set.legs) {
+        const l = set.legs[i];
+        if (l.visits[l.visits.length-1].toGo === undefined) {
+          return b;
+        }
+        if (l.visits[l.visits.length-1].toGo[0] == 0 && i%2 == 1)
+          b[0] += 1;
+        else if (l.visits[l.visits.length-1].toGo[1] == 0 && i%2 == 0)
+          b[1] += 1;
+      }
+    }
+    return b;
+  });
+  ret.breaks = breaks;
+
+  const getVal = (tr) => {
+    const val = tr.trim();
+    if (val == "") {
+      return 0;
+    }
+    if (val == "SB") {
+      return 25;
+    }
+    if (val == "DB") {
+      return 50;
+    }
+    if (val[0] == "S" || val[0] == "O" || val[0] == "I") {
+      return parseFloat(val.substring(1));
+    }
+    if (val[0] == "D") {
+      return 2 * parseFloat(val.substring(1));
+    }
+    if (val[0] == "T") {
+      return 3 * parseFloat(val.substring(1));
+    }
+    if (val[0] == "M") {
+      return 0;
+    } else {
+      // TODO: Check for Na
+      return parseFloat(val);
+    }
+  }
+  const verifySum = (sum) => {
+    if (sum > 180 || [179, 178, 176, 175, 173, 172, 169, 166, 163].indexOf(sum) > -1) {
+      return -1;
+    } else if (current_toGo.value[current_scorer_idx.value] - sum < 0) {
+      return -2;
+    } if (current_toGo.value[current_scorer_idx.value] - sum == 0) {
+      // bogey numbers
+      if (page.out == "Double" && (sum > 170 || [169, 168, 166, 165, 163, 162, 159].indexOf(sum) > -1)) {
+        return -1;
+      }
+      return 0;
+    } else if (current_toGo.value[current_scorer_idx.value] - sum <= 50) {
+      return 1;
+    } else if (page.in != "Straight" && current_toGo.value[current_scorer_idx.value] == page.modus && sum != 0) {
+      return 3;
+    }
+    return 2;
+  }
+
+  const checkVisit = (throws) => {
+    const tr = throws.split(",");
+    let sum = 0;
+    tr.forEach((t, i) => {
+      sum += getVal(t);
+    });
+    const res = verifySum(sum);
+    return [res, sum];
+  }
+  ret.checkVisit = checkVisit;
+
+  return ret;
+}
\ No newline at end of file
diff --git a/assets/js/views/xoi/main.js b/assets/js/views/xoi/main.js
index 1cf9328..03ca796 100644
--- a/assets/js/views/xoi/main.js
+++ b/assets/js/views/xoi/main.js
@@ -1,10 +1,9 @@
-import { nextTick, watch, reactive, ref, computed, onMounted, onUnmounted } from "vue";
+import { reactive, ref, computed, onMounted, toRaw } from "vue";
 import { getQuery, setKirby } from "../../kirby.js";
-import { state } from "../../stateMgr.js";
 import { handleActive, ArrowVerticalKeyHandler, ArrowHorizontalKeyHandler, NumberKeyHandler } from "../../handlers.js";
 import { overlayAndGet, powerStateMachine, overlayAndPop, popLastElem } from "../../componentPromise.js";
 
-import { getGameProps, initGame, initStats, storeVisit, formatDate, removeLastVisit, extension, getFinalWinner } from "./logic.js";
+import { getGameProps, initGame, initStats, storeVisit, formatDate, removeLastVisit, extension, getFinalWinner, playerFromUUID } from "./logic.js";
 
 const html = (v) => { return v[0] };
 
@@ -19,13 +18,29 @@ const pregame = {
 
     const selectPlayer = async (i) => {
       if (props.active) {
-        const [result, error] = await overlayAndPop("d-playerSelect", { players: props.page.participants, class:"overlay"}, props.stack);
+        let [result, error] = await overlayAndPop("d-select", { type: "player", options: props.page.participants, class:"overlay"}, props.stack);
         if (error === undefined) {
           props.page.players[i] = result;
         }
       }
     }
 
+    const selectScorer = async (i) => {
+      if (props.active) {
+        const [scorer, error] = await overlayAndPop("d-select", { type: "scorer", options: props.page.participants, class:"overlay"}, props.stack);
+        if (error === undefined) {
+          if (scorer.member.length > 1){ 
+            const [captain, err] = await overlayAndPop("d-select", { type: "player", title: "Team Captain", options: [scorer.member[0],scorer.member[1]], class:"overlay"}, props.stack);
+            if (err !== undefined){
+              return selectScorer(i);
+            }
+            scorer.member = [captain, scorer.member[0] == captain ? scorer.member[1] : scorer.member[0]];
+          }
+          props.page.scorers[i] = scorer;
+        }
+      }
+    }
+
     const selectX01 = async () => {
       if (props.active) {
         const [result, error] = await overlayAndPop("d-select", { options: [ "301", "501" ], class:"overlay"}, props.stack);
@@ -44,15 +59,16 @@ const pregame = {
       }
     }
 
-    return { selectPlayer, selectX01, selectIn }
+    return { selectX01, selectIn, selectScorer }
   },
   template: html`
   <nav class="gamesetup" :disabled="!active">
     <h1>Game Setup</h1>
     <div class="menu">
       <!-- <div><span class="label">Name:</span><d-inputElem v-index="active" v-model="game.title"></d-inputElem></div> -->
-      <div><span class="label">Player 1:</span><d-playerElem v-index="active" @click="selectPlayer(0)" :player="page.players[0]"></d-playerElem></div>
-      <div><span class="label">Player 2:</span><d-playerElem v-index="active" @click="selectPlayer(1)" :player="page.players[1]"></d-playerElem></div>
+      <div><span class="label">Scorer 1:</span><d-scorerElem v-index="active" @click="selectScorer(0)" :scorer="page.scorers[0]"></d-scorerElem></div>
+      <div><span class="label">Scorer 2:</span><d-scorerElem v-index="active" @click="selectScorer(1)" :scorer="page.scorers[1]"></d-scorerElem></div>
+
       <div><span class="label">X01:</span><d-plainElem v-index="active" @click="selectX01()" :text="page.modus"></d-plainElem></div>
       <div><span class="label">In:</span><d-plainElem v-index="active" @click="selectIn()" :text="page.in"></d-plainElem></div>
       <!-- <div><span class="label">Best of Sets:</span><d-inputElem v-index="active" v-model="page.sets"></d-inputElem></div> -->
@@ -64,14 +80,15 @@ const pregame = {
 }
 
 export const bullselect = {
-  props: ['players','active', 'stack'],
+  props: ['scorers', 'active', 'stack'],
   setup(props, { emit }) {
     handleActive(props, [ArrowHorizontalKeyHandler, NumberKeyHandler]);
 
     const children = computed(() => {
       const items = [];
-      for (let i in props.players){
-        const player = props.players[i];
+      for (let i in props.scorers){
+        const player = props.scorers[i].member[0];
+        
         items.push({
           component: "d-squareElem",
           props: {
@@ -79,7 +96,7 @@ export const bullselect = {
             icon: player.img ? player.img : '/assets/img/placeholder_person.png'
           },
           onClick: () => {
-            emit("resolve", player);
+            emit("resolve", props.scorers[i]);
           }
         })
       }
@@ -123,8 +140,8 @@ const score = {
   `
 }
 
-const player = {
-  props: ['page', 'id', 'current_stat'],
+const scorer = {
+  props: ['page', 'id', 'current_stat', 'current_leg'],
   setup(props) {
     const addStats = (stat1, stat2) => {
       let res = {
@@ -146,23 +163,17 @@ const player = {
     }
     const inspect = !!props.page.enddate;
     const tourStats = computed(() => {
-      if (props.page.tournamentStats.length != 2){
-        return [
-          props.page.stats.stats[0],
-          props.page.stats.stats[1]
-        ];
-      }
       if (inspect) {
-       return [
-         props.page.tournamentStats[0],
-         props.page.tournamentStats[1]
-       ];
+       return props.page.tournamentStats;
       }
-      return [
-        addStats(props.page.tournamentStats[0], props.page.stats.stats[0]),
-        addStats(props.page.tournamentStats[1], props.page.stats.stats[1])
-      ];
+      return props.page.tournamentStats.map((s,i) => {
+        if (s.length == 0){
+          return props.page.stats.stats[i];
+        }
+        return addStats(s,props.page.stats.stats[i])
+      });
     });
+
     const getAverage = (avg) => {
       return avg && avg[1] != 0 ? ((3*avg[0])/avg[1]).toFixed(1) : "-";
     }
@@ -175,59 +186,113 @@ const player = {
       }
       return "-"
     }
-    const player = computed(() => props.page.players[props.id])
-    return { tourStats, getAverage, getCheckout, getMax, player }
+    
+    const scorer = ref(props.page.scorers[props.id]);
+    const allScorerIndices = computed(() => scorer.value.member.map((p) => props.page.stats.stats.map((s) => s.player).indexOf(p.uuid)));
+    
+    const currentScorerIdx = computed(() => {
+      if (scorer.value.member.length == 1){
+        return 0;
+      }
+      const idx = props.page.scorers[props.id].member.map((p) => p.uuid).indexOf(props.current_leg.visits.at(-1).player);      
+      return idx;
+    });
+    
+    const tnmStats = computed(() => {
+      if (currentScorerIdx.value == -1){
+        return addStats(tourStats.value[allScorerIndices.value[0]], tourStats.value[allScorerIndices.value[1]]);
+      }
+      return tourStats.value[allScorerIndices.value[currentScorerIdx.value]];
+    });
+    
+    const matchStats = computed(() => {
+      if (currentScorerIdx.value == -1){
+        return addStats(props.page.stats.stats[allScorerIndices.value[0]], props.page.stats.stats[allScorerIndices.value[1]]);
+      }
+      return props.page.stats.stats[allScorerIndices.value[currentScorerIdx.value]];
+    });
+
+    const legStats = computed(() => {
+      if (currentScorerIdx.value == -1){
+        return addStats(props.current_stat.stats[allScorerIndices.value[0]], props.current_stat.stats[allScorerIndices.value[1]]);
+      }
+      return props.current_stat.stats[allScorerIndices.value[currentScorerIdx.value]];
+    });
+
+    
+    return { tnmStats, matchStats, legStats, getAverage, getCheckout, getMax, scorer, currentScorerIdx }
   },
   template: html`
-    <div class="player">
-      <img style="width: 100%" :src="player.img ? player.img : '/assets/img/placeholder_person.png'">
-      <h2 class="name">{{ player.forename }} {{ player.surname }}</h2>
-      <h3 class="nickname">{{ player.nickname }}</h3>
+    <div class="player" :class="{ 'team': scorer.member.length == 2 }">
+      <template v-if="scorer.member.length == 1">
+        <img style="width: 100%" :src="scorer.member[0].img ? scorer.member[0].img : '/assets/img/placeholder_person.png'">
+        <h2 class="name">{{ scorer.member[0].forename }} {{ scorer.member[0].surname }}</h2>
+        <h3 class="nickname">{{ scorer.member[0].nickname }}</h3>
+      </template>
+      <template v-if="scorer.member.length == 2">
+        <div class="team images">
+          <img :class="{ 'active': currentScorerIdx == 0, 'inactive': currentScorerIdx == 1  }" :src="scorer.member[0].img ? scorer.member[0].img : '/assets/img/placeholder_person.png'">
+          <img :class="{ 'active': currentScorerIdx == 1, 'inactive': currentScorerIdx == 0  }" :src="scorer.member[1].img ? scorer.member[1].img : '/assets/img/placeholder_person.png'">
+        </div>
+        <div class="team titles">
+          <div class="title" :class="{ 'active': currentScorerIdx == -1 }">
+            <h2 class="name">{{ scorer.member[0].forename }} + {{ scorer.member[1].forename }}</h2>
+          </div>
+          <div class="title" :class="{ 'active': currentScorerIdx == 0 }">
+            <h2 class="name">{{ scorer.member[0].forename }} {{ scorer.member[0].surname }}</h2>
+            <h3 class="nickname">{{ scorer.member[0].nickname }}</h3>
+          </div>
+          <div class="title" :class="{ 'active': currentScorerIdx == 1 }">
+            <h2 class="name">{{ scorer.member[1].forename }} {{ scorer.member[1].surname }}</h2>
+            <h3 class="nickname">{{ scorer.member[1].nickname }}</h3>
+          </div>
+        </div>
+      </template>
       <div class="stats">
         <div class="row header">
           <div>Stat</div><div>Tnm</div><div>Match</div><div>Leg</div>
         </div>
         <div class="row">
           <div>Avg:</div><div>
-            {{ getAverage(tourStats[id].average) }}
+            {{ getAverage(tnmStats.average) }}
           </div><div>
-            {{ getAverage(page.stats.stats[id].average) }}
+            {{ getAverage(matchStats.average) }}
           </div><div>
-            {{ getAverage(current_stat.stats[id].average) }}
+            {{ getAverage(legStats.average) }}
           </div>
         </div>
         <div class="row">
           <div>First 9:</div><div>
-            {{ getAverage(tourStats[id].first9) }}
+            {{ getAverage(tnmStats.first9) }}
           </div><div>
-            {{ getAverage(page.stats.stats[id].first9) }}
+            {{ getAverage(matchStats.first9) }}
           </div><div>
-            {{ getAverage(current_stat.stats[id].first9) }}
+            {{ getAverage(legStats.first9) }}
           </div>
         </div>
         <div class="row">
-          <div>60+:</div><div>{{ tourStats[id]["60+"] }}</div><div>{{ page.stats.stats[id]["60+"] }}</div><div>{{ current_stat.stats[id]["60+"] }}</div>
+          <div>60+:</div><div>{{ tnmStats["60+"] }}</div><div>{{ matchStats["60+"] }}</div><div>{{ legStats["60+"] }}</div>
         </div>
         <div class="row">
-          <div>100+:</div><div>{{ tourStats[id]["100+"] }}</div><div>{{ page.stats.stats[id]["100+"] }}</div><div>{{ current_stat.stats[id]["100+"] }}</div>
+          <div>100+:</div><div>{{ tnmStats["100+"] }}</div><div>{{ matchStats["100+"] }}</div><div>{{ legStats["100+"] }}</div>
         </div>
         <div class="row">
-          <div>140+:</div><div>{{ tourStats[id]["140+"] }}</div><div>{{ page.stats.stats[id]["140+"] }}</div><div>{{ current_stat.stats[id]["140+"] }}</div>
+          <div>140+:</div><div>{{ tnmStats["140+"] }}</div><div>{{ matchStats["140+"] }}</div><div>{{ legStats["140+"] }}</div>
         </div>
         <div class="row">
-          <div>180:</div><div>{{ tourStats[id]["180"] }}</div><div>{{ page.stats.stats[id]["180"] }}</div><div>{{ current_stat.stats[id]["180"] }}</div>
+          <div>180:</div><div>{{ tnmStats["180"] }}</div><div>{{ matchStats["180"] }}</div><div>{{ legStats["180"] }}</div>
         </div>
         <div class="row" v-if="page.in == 'Double'">
-          <div>Ch. I. %:</div><div>{{ getCheckout(tourStats[id].checkins) }}%</div><div>{{ getCheckout(page.stats.stats[id].checkins) }}%</div><div>{{ getCheckout(current_stat.stats[id].checkins) }}%</div>
+          <div>Ch. I. %:</div><div>{{ getCheckout(tnmStats.checkins) }}%</div><div>{{ getCheckout(matchStats.checkins) }}%</div><div>{{ getCheckout(legStats.checkins) }}%</div>
         </div>
         <div class="row" v-if="page.in == 'Double'">
-          <div>Best Ch.:</div><div>{{ getMax(tourStats[id].checkinPoints) }}</div><div>{{ getMax(page.stats.stats[id].checkinPoints) }}</div><div>{{ getMax(current_stat.stats[id].checkinPoints) }}</div>
+          <div>Best Ch.:</div><div>{{ getMax(tnmStats.checkinPoints) }}</div><div>{{ getMax(matchStats.checkinPoints) }}</div><div>{{ getMax(legStats.checkinPoints) }}</div>
         </div>
         <div class="row">
-          <div>Ch. O. %:</div><div>{{ getCheckout(tourStats[id].checkouts) }}%</div><div>{{ getCheckout(page.stats.stats[id].checkouts) }}%</div><div></div>
+          <div>Ch. O. %:</div><div>{{ getCheckout(tnmStats.checkouts) }}%</div><div>{{ getCheckout(matchStats.checkouts) }}%</div><div></div>
         </div>
         <div class="row">
-          <div>Best Ch.:</div><div>{{ getMax(tourStats[id].checkoutPoints) }}</div><div>{{ getMax(page.stats.stats[id].checkoutPoints) }}</div><div></div>
+          <div>Best Ch.:</div><div>{{ getMax(tnmStats.checkoutPoints) }}</div><div>{{ getMax(matchStats.checkoutPoints) }}</div><div></div>
         </div>
       </div>
     </div>
@@ -236,11 +301,15 @@ const player = {
 
 
 const game = {
-  props: ['active', 'stack', 'players','current_leg', 'max'],
+  props: ['active', 'stack', 'scorers', 'current_leg', 'max'],
   setup(props, context) {
-    const visits = computed(() => props.current_leg ? props.current_leg.visits:undefined );
-    const getPlayerVisits = (uuid) => {
-      const vs = visits.value.filter((v) => v.player == uuid);
+    const visits = computed(() => props.current_leg ? props.current_leg.visits : undefined );
+    
+    const getScorersVisits = (scorer) => {
+
+      // const vs = visits.value.filter((v,i) => i % 2 == props.scorers.map((p) => p.uuid).indexOf(uuid) % 2);
+      const vs = visits.value.filter((v,i) => scorer.member.map((p) => p.uuid).indexOf(v.player) != -1);
+      
       if (vs.length < 9) {
         for (var i = vs.length; i < 9; i++) {
           vs.push({ "sum": "", "toGo":["",""]})
@@ -251,34 +320,34 @@ const game = {
       }
       return vs;
     }
-    return { getPlayerVisits }
+    return { getScorersVisits }
   },
   template: html`
     <div class="game">
       <div class="headding">
-        <div class="headding points player1">Points</div>
-        <div class="headding toGo player1">ToGo</div>
+        <div class="headding points scorer1">Points</div>
+        <div class="headding toGo scorer1">ToGo</div>
         <div class="headding rounds">Round</div>
-        <div class="headding points player2">Points</div>
-        <div class="headding toGo player2">ToGo</div>
+        <div class="headding points scorer2">Points</div>
+        <div class="headding toGo scorer2">ToGo</div>
       </div>
       <div class="body">
-        <div class="points player1"></div>
-        <div class="toGo player1">{{ max }}</div>
+        <div class="points scorer1"></div>
+        <div class="toGo scorer1">{{ max }}</div>
         <div class="rounds">0</div>
-        <div class="points player2"></div>
-        <div class="toGo player2">{{ max }}</div>
-        <template v-for="j in [1,2]" v-if="players">
-          <template v-for="visit, i in getPlayerVisits(players[j-1].uuid)">
+        <div class="points scorer2"></div>
+        <div class="toGo scorer2">{{ max }}</div>
+        <template v-for="j in [1,2]" v-if="scorers">
+          <template v-for="visit, i in getScorersVisits(scorers[j-1])">
             <template v-if="visit.toGo === undefined">
-              <div :class="'points player'+j+' input'">
+              <div :class="'points scorer'+j+' input'">
                 <slot />
               </div>
-              <div :class="'toGo player'+j"></div>
+              <div :class="'toGo scorer'+j"></div>
             </template>
             <template v-if="visit.toGo !== undefined">
-              <div :class="'points player'+j">{{ visit.sum }}</div>
-              <div :class="'toGo player'+j">{{ visit.toGo[j-1] }}</div>
+              <div :class="'points scorer'+j">{{ visit.sum }}</div>
+              <div :class="'toGo scorer'+j">{{ visit.toGo[j-1] }}</div>
             </template>
             <div class="rounds" v-if="j == 1">{{ (i+1)*3 }}</div>
           </template>
@@ -328,7 +397,7 @@ const gameinput = {
 const xoi = {
   props: ['page', 'active', 'stack', 'inspect', 'watch'],
   components: {
-    "d-player": player,
+    "d-scorer": scorer,
     "d-score": score,
     "d-game": game
   },
@@ -342,7 +411,7 @@ const xoi = {
     if (props.inspect) {
       current_set = computed(() => props.page.game.sets[set_id.value]);
       current_leg = computed(() => current_set.value.legs[leg_id.value]);
-      current_stat = computed( () => props.page.stats?.sets[set_id.value].legs[leg_id.value]);
+      current_stat = computed(() => props.page.stats?.sets[set_id.value].legs[leg_id.value]);
     }
     if (props.watch) {
       setInterval(async () => {
@@ -352,6 +421,7 @@ const xoi = {
       }, 2000);
     }
     const computedProps = getGameProps(props.page, current_set, current_leg);
+    
     if (!props.inspect) {
       current_stat = computed( () => props.page.stats?.sets[props.page.stats.sets.length-1].legs[computedProps.current_set.value.legs.length-1]);
     }
@@ -360,21 +430,25 @@ const xoi = {
       if (props.inspect || props.watch) {
       } else {
         const winner = await gameHandler(gamestack, props.stack, props.page, computedProps)
-        context.emit('resolve', winner);
+        if (winner === undefined){
+          context.emit('reject', winner);
+        } else {
+          context.emit('resolve', winner);
+        }
       }
     })
     return { ...computedProps, set_id, leg_id, gamestack, inspectstack, current_stat }
   },
   template: html`
     <div class="xoi">
-      <div class="bigToGo one" :class="{'active' : current_player==0 }">{{ current_toGo[0] }}</div>
+      <div class="bigToGo one" :class="{'active' : current_scorer_idx==0 }">{{ current_toGo[0] }}</div>
       <d-score :page="page" :justlegs="page && page.sets == 1" :current_set_points="current_set_points" :current_leg_points="current_leg_points"></d-score>
-      <div class="bigToGo two" :class="{'active' : current_player==1 }">{{ current_toGo[1] }}</div>
-      <d-player class="player1" :page="page" :id="0" :current_stat="current_stat"></d-player>
-      <d-game :active="active" :stack="stack" :players="page.players" :max="page.modus" :current_leg="current_leg" >
+      <div class="bigToGo two" :class="{'active' : current_scorer_idx==1 }">{{ current_toGo[1] }}</div>
+      <d-scorer class="scorer1" :page="page" :id="0" :current_stat="current_stat" :current_leg="current_leg"></d-scorer>
+      <d-game :active="active" :stack="stack" :scorers="page.scorers" :max="page.modus" :current_leg="current_leg" >
         <d-renderer :stack="gamestack"></d-renderer>
       </d-game>
-      <d-player class="player2" :page="page" :id="1" :current_stat="current_stat"></d-player>
+      <d-scorer class="scorer2" :page="page" :id="1" :current_stat="current_stat" :current_leg="current_leg"></d-scorer>
       <div class="nav" v-if="inspect">
         <span class="label" v-if="page.sets != 1">Set:</span><d-plainElem :text="set_id+1"  v-if="page.sets != 1" v-index="active" @click="set_id = (set_id+1)%page.game.sets.length; leg_id=0"></d-plainElem><span class="label">Leg:</span><d-plainElem style="padding:0.2em 0.5em" :text="leg_id+1" v-index="active"  v-autofocus="true" @click="leg_id = (leg_id+1)%current_set.legs.length"></d-plainElem>
       </div>
@@ -494,12 +568,27 @@ function refreshGame(id){
   return getQuery(`site.find('${id}')`, {
     select: {
       game: "page.rounds.parseJSON",
-      stats: "page.stats.parseJSON"
+      stats: "page.stats.parseJSON",
+      tournamentStats: "page.tournamentStats"
     }
   })
 }
 
+async function reloadGame(page){
+  let gs = await refreshGame(page.id);
+  page.game = gs.game;
+  page.stats = gs.stats;
+  page.tournamentStats = gs.tournamentStats;
+}
+
 function getGame(id){
+  const playerInfo = {
+    forename: "page.forename",
+    surname: "page.surname",
+    nickname: "page.nickname",
+    uuid: "page.uuid",
+    img: "page.pic.toFile?.thumbnail(350).url"
+  };
   return getQuery(`site.find('${id}')`, {
     select: {
       title: "page.title",
@@ -515,23 +604,21 @@ function getGame(id){
       enddate: "page.Enddate",
       tournamentStats: "page.tournamentStats",
       participants: {
-        query: "page.parent.participants.toPages.sortBy('forename')",
-        select:{
-          forename: "page.forename",
-          surname: "page.surname",
-          nickname: "page.nickname",
-          uuid: "page.uuid",
-          img: "page.pic.toFile?.url"
+        query: "page.parent.scorers",
+        select: {
+          member: {
+            query: "structureItem.member.toPages",
+            select: playerInfo
+          }
         }
       },
-      players: {
-        query: "page.players.toPages",
-        select:{
-          forename: "page.forename",
-          surname: "page.surname",
-          nickname: "page.nickname",
-          uuid: "page.uuid",
-          img: "page.pic.toFile?.thumbnail(350).url"
+      scorers: {
+        query: "page.scorers.toStructure",
+        select: {
+          member: {
+            query: "structureItem.member.toPages",
+            select: playerInfo
+          }
         }
       }
     }
@@ -544,8 +631,12 @@ function savePregame(page){
       legs: page.legs,
       max: page.modus,
       in: page.in,
-      players: page.players.map((p) => p.uuid),
-      startdate: page.startdate,
+      scorers: page.scorers.map((s) => {
+        const copy = Object.assign({},s);
+        copy.member = copy.member.map((p) => p.uuid)
+        return copy
+      }),
+      startdate: page.startdate ? page.startdate : "",
       rounds: page.game ? JSON.stringify(page.game) : "",
       stats: page.stats ? JSON.stringify(page.stats) : ""
   });
@@ -555,7 +646,7 @@ function saveGame(page){
   return setKirby(page.id, {
       rounds: page.game ? JSON.stringify(page.game) : "",
       stats: page.stats ? JSON.stringify(page.stats) : "",
-      enddate: page.enddate,
+      enddate: page.enddate ? page.enddate : "",
   });
 }
 
@@ -616,11 +707,14 @@ const gameStateMachine = (gamestack, stack, page, computedProps) => {
       let [visit, error] = await overlayAndPop("d-gameinput", { input: input }, gamestack);
       
       if (parseFloat(visit) < 0 ){
-        visit = ""+(computedProps.current_toGo.value[computedProps.current_player.value * 1] - parseFloat(visit)*-1);
+        visit = ""+(computedProps.current_toGo.value[computedProps.current_scorer_idx.value * 1] - parseFloat(visit)*-1);
       }
         // back/delete last throw
       if (error != undefined) {
         const val = removeLastVisit(page);
+        if (val === undefined) {
+          return [undefined, undefined];
+        }
         saveGame(page);
         if (val == undefined) return [1, val];
         return [1, val.join(",")];
@@ -648,12 +742,10 @@ const gameStateMachine = (gamestack, stack, page, computedProps) => {
         return [1, undefined]
       } else if (ret == 2) {
         // Normal
-        storeVisit(page, visit.split(","), sum, 3, 0);
+        storeVisit(page, visit.split(","), sum, 3, 0);   
         saveGame(page);
         return [1, undefined]
-      }
-      // checkout:
-      if (ret == 0) {
+      } else if (ret == 0) {
         // Checkout: Ask for num Darts
         [numDarts, tries] = await powerStateMachine(checkoutPipeline(stack), stack, /*initState=*/0, /*initInput=*/sum);
       } else if (ret == 1) {
@@ -671,9 +763,16 @@ const gameStateMachine = (gamestack, stack, page, computedProps) => {
           const winner = getFinalWinner(page);
           let name = "DRAW"
           if (winner != -2){
-            name = page.players[winner].forename;
+            name = page.scorers[winner].member.map((p) => p.forename).join(" + ");
           }
           const [answer, error] = await overlayAndPop("d-dialog", gameOverDialog(name, points[1], computedProps.breaks.value), stack);
+          if (error != undefined) {
+            extension(page);
+            const val = removeLastVisit(page);
+            saveGame(page);
+            if (val == undefined) return [1, val];
+            return [1, val.join(",")];
+          }
           if (answer == "end") {
             saveGame(page);
             return [undefined, page.stats.winner];
@@ -708,8 +807,8 @@ const stateMachine = (stack, page) => {
     0: async (input, reGet) => {
         // Dispatcher
         // Check if in watchmode
-        // Check Game State:
-        if (page.players.length != 2 || page.startdate === undefined || page.startdate === ""){
+        // Check Game State:        
+        if ( page.scorers.length != 2 || page.startdate === undefined || page.startdate === ""){
           // Pre Game
           return [1, page];
         } else if (page.enddate === undefined || page.enddate === ""){
@@ -750,23 +849,34 @@ const stateMachine = (stack, page) => {
     },
     2: async (page, reGet) => {
         // Ask for Bull
-        const [result, error] = await overlayAndPop("d-bullselect", { players: page.players}, stack);
+        const [scorer, error] = await overlayAndPop("d-bullselect", { scorers: page.scorers}, stack);
         if (error != undefined) {
+          page.startdate = undefined;
+          const ret = await savePregame(page);
           return [1, page];
         }
-        // reorderPlayer
-        if (result !== page.players[0]){
-          page.players = [page.players[1], page.players[0]];
+        // reorder Scorer
+        if (scorer !== page.scorers[0]){
+          page.scorers = [page.scorers[1], page.scorers[0]];
         }
+        
         // Setup Game
         initGame(page);
         initStats(page);
         const ret = await savePregame(page);
+        await reloadGame(page);
+        
         return [3, page];
     },
     3: async (page, reGet) => {
         // In Game
         const [result, error] = await overlayAndPop("d-xoi", { page: page, inspect: false }, stack);
+        if (error) {
+          page.game = undefined;
+          page.stats = undefined;
+          const ret = await savePregame(page);
+          return [2, page];
+        }
         return [4, result];
     },
     4: async (winnerUUID, reGet) => {
diff --git a/content/1_members/18_todo3/member.txt b/content/1_members/18_todo3/member.txt
index f65d21d..0c8fd9c 100644
--- a/content/1_members/18_todo3/member.txt
+++ b/content/1_members/18_todo3/member.txt
@@ -10,7 +10,7 @@ Surname: Motzek
 
 ----
 
-Nickname: ?
+Nickname: TODO
 
 ----
 
@@ -22,4 +22,8 @@ Pic:
 
 ----
 
+Files: 
+
+----
+
 Uuid: 9S2pH2C0vG8XUrye
\ No newline at end of file
diff --git a/content/1_members/24_230/member.txt b/content/1_members/24_230/member.txt
index 84271a6..3a5261f 100644
--- a/content/1_members/24_230/member.txt
+++ b/content/1_members/24_230/member.txt
@@ -10,7 +10,7 @@ Surname: Ouakili-Bilan
 
 ----
 
-Nickname: 
+Nickname: TODO
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/54kd4kbk/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/54kd4kbk/xoi.txt
index 3ecaa91..b59a388 100644
--- a/content/2_seasons/1_2024/1_summer-slam/54kd4kbk/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/54kd4kbk/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://aHO5FUnIphBwYEjS
-- page://XDZibCkgJ9repYEx
+Scorers:
+
+- 
+  member:
+    - page://aHO5FUnIphBwYEjS
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/7nykca7i/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/7nykca7i/xoi.txt
index ed34cec..0b054b1 100644
--- a/content/2_seasons/1_2024/1_summer-slam/7nykca7i/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/7nykca7i/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://XDZibCkgJ9repYEx
-- page://UkQNJytohCGIXySl
+Scorers:
+
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
+- 
+  member:
+    - page://UkQNJytohCGIXySl
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/her1fj3r/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/her1fj3r/xoi.txt
index f850e60..4246583 100644
--- a/content/2_seasons/1_2024/1_summer-slam/her1fj3r/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/her1fj3r/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://XDZibCkgJ9repYEx
-- page://90CUYLfokdOm9Gw0
+Scorers:
+
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/jm4ju7pi/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/jm4ju7pi/xoi.txt
index 082eded..ec15815 100644
--- a/content/2_seasons/1_2024/1_summer-slam/jm4ju7pi/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/jm4ju7pi/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://fShTMgFob20fogyr
-- page://9S2pH2C0vG8XUrye
+Scorers:
+- 
+  member:
+    - page://fShTMgFob20fogyr
+- 
+  member:
+    - page://9S2pH2C0vG8XUrye
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/l0j8jkts/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/l0j8jkts/xoi.txt
index 6f04d5e..82a5423 100644
--- a/content/2_seasons/1_2024/1_summer-slam/l0j8jkts/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/l0j8jkts/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://5bw1wQY8DAfxUVAw
-- page://90CUYLfokdOm9Gw0
+Scorers:
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/lsng5wlg/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/lsng5wlg/xoi.txt
index 900ee69..d7d9873 100644
--- a/content/2_seasons/1_2024/1_summer-slam/lsng5wlg/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/lsng5wlg/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://aHO5FUnIphBwYEjS
-- page://5qeooGppOFqpprW5
+Scorers:
+- 
+  member:
+    - page://aHO5FUnIphBwYEjS
+- 
+  member:
+    - page://5qeooGppOFqpprW5
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/m7tb5bac/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/m7tb5bac/xoi.txt
index 94b22a9..556bc3e 100644
--- a/content/2_seasons/1_2024/1_summer-slam/m7tb5bac/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/m7tb5bac/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://XDZibCkgJ9repYEx
-- page://TbZF36aHK27hZvnK
+Scorers:
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/mxkfs1yq/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/mxkfs1yq/xoi.txt
index b144ba2..ef0a65b 100644
--- a/content/2_seasons/1_2024/1_summer-slam/mxkfs1yq/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/mxkfs1yq/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://4CPpeIGeeK8UHTf8
-- page://5bw1wQY8DAfxUVAw
+Scorers:
+- 
+  member:
+    - page://4CPpeIGeeK8UHTf8
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/osbkse46/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/osbkse46/xoi.txt
index 30b9d9b..0380e8f 100644
--- a/content/2_seasons/1_2024/1_summer-slam/osbkse46/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/osbkse46/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://7GAUHPdaKdD2sHm9
-- page://5qeooGppOFqpprW5
+Scorers:
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
+- 
+  member:
+    - page://5qeooGppOFqpprW5
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/rtjuyvsv/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/rtjuyvsv/xoi.txt
index 4bbb069..b286021 100644
--- a/content/2_seasons/1_2024/1_summer-slam/rtjuyvsv/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/rtjuyvsv/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://9S2pH2C0vG8XUrye
-- page://ZUPj0Nw2DcaIQ1H1
+Scorers:
+- 
+  member:
+    - page://9S2pH2C0vG8XUrye
+- 
+  member:
+    - page://ZUPj0Nw2DcaIQ1H1
 
 ----
 
diff --git a/content/2_seasons/1_2024/1_summer-slam/tournament.txt b/content/2_seasons/1_2024/1_summer-slam/tnmbrackets.txt
similarity index 100%
rename from content/2_seasons/1_2024/1_summer-slam/tournament.txt
rename to content/2_seasons/1_2024/1_summer-slam/tnmbrackets.txt
diff --git a/content/2_seasons/1_2024/1_summer-slam/z7nvffvf/xoi.txt b/content/2_seasons/1_2024/1_summer-slam/z7nvffvf/xoi.txt
index 931fb0d..2f76686 100644
--- a/content/2_seasons/1_2024/1_summer-slam/z7nvffvf/xoi.txt
+++ b/content/2_seasons/1_2024/1_summer-slam/z7nvffvf/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://aHO5FUnIphBwYEjS
-- page://fShTMgFob20fogyr
+Scorers:
+- 
+  member:
+    - page://aHO5FUnIphBwYEjS
+- 
+  member:
+    - page://fShTMgFob20fogyr
 
 ----
 
diff --git a/content/2_seasons/1_2024/2_spring-break/13tntlfj/xoi.txt b/content/2_seasons/1_2024/2_spring-break/13tntlfj/xoi.txt
index 8b289a1..400c4af 100644
--- a/content/2_seasons/1_2024/2_spring-break/13tntlfj/xoi.txt
+++ b/content/2_seasons/1_2024/2_spring-break/13tntlfj/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://UkQNJytohCGIXySl
-- page://5bw1wQY8DAfxUVAw
+Scorers:
+- 
+  member:
+    - page://UkQNJytohCGIXySl
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
 
 ----
 
diff --git a/content/2_seasons/1_2024/2_spring-break/3flmnq6b/xoi.txt b/content/2_seasons/1_2024/2_spring-break/3flmnq6b/xoi.txt
index 8e86024..82c2744 100644
--- a/content/2_seasons/1_2024/2_spring-break/3flmnq6b/xoi.txt
+++ b/content/2_seasons/1_2024/2_spring-break/3flmnq6b/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://x8tm8FzBBY95HqIi
-- page://TbZF36aHK27hZvnK
+Scorers:
+- 
+  member:
+    - page://x8tm8FzBBY95HqIi
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
 
 ----
 
diff --git a/content/2_seasons/1_2024/2_spring-break/cbwvnzxm/xoi.txt b/content/2_seasons/1_2024/2_spring-break/cbwvnzxm/xoi.txt
index 16274f2..0f73d5c 100644
--- a/content/2_seasons/1_2024/2_spring-break/cbwvnzxm/xoi.txt
+++ b/content/2_seasons/1_2024/2_spring-break/cbwvnzxm/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://Ue0F1SstBqE7xVKr
-- page://8TlbKlF7fVBwS24c
+Scorers:
+- 
+  member:
+    - page://Ue0F1SstBqE7xVKr
+- 
+  member:
+    - page://8TlbKlF7fVBwS24c
 
 ----
 
diff --git a/content/2_seasons/1_2024/2_spring-break/cutywjod/xoi.txt b/content/2_seasons/1_2024/2_spring-break/cutywjod/xoi.txt
index 8d50dcc..34686f8 100644
--- a/content/2_seasons/1_2024/2_spring-break/cutywjod/xoi.txt
+++ b/content/2_seasons/1_2024/2_spring-break/cutywjod/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://5bw1wQY8DAfxUVAw
-- page://x8tm8FzBBY95HqIi
+Scorers:
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
+- 
+  member:
+    - page://x8tm8FzBBY95HqIi
 
 ----
 
diff --git a/content/2_seasons/1_2024/2_spring-break/kkchbr4a/xoi.txt b/content/2_seasons/1_2024/2_spring-break/kkchbr4a/xoi.txt
index 59ee53d..894b3f9 100644
--- a/content/2_seasons/1_2024/2_spring-break/kkchbr4a/xoi.txt
+++ b/content/2_seasons/1_2024/2_spring-break/kkchbr4a/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://Ue0F1SstBqE7xVKr
-- page://fShTMgFob20fogyr
+Scorers:
+- 
+  member:
+    - page://Ue0F1SstBqE7xVKr
+- 
+  member:
+    - page://fShTMgFob20fogyr
 
 ----
 
diff --git a/content/2_seasons/1_2024/2_spring-break/ovcmf1c0/xoi.txt b/content/2_seasons/1_2024/2_spring-break/ovcmf1c0/xoi.txt
index 4555a80..4d9c380 100644
--- a/content/2_seasons/1_2024/2_spring-break/ovcmf1c0/xoi.txt
+++ b/content/2_seasons/1_2024/2_spring-break/ovcmf1c0/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://7GAUHPdaKdD2sHm9
-- page://5bw1wQY8DAfxUVAw
+Scorers:
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
 
 ----
 
diff --git a/content/2_seasons/1_2024/2_spring-break/sbggpar6/xoi.txt b/content/2_seasons/1_2024/2_spring-break/sbggpar6/xoi.txt
index 4ebf546..2f32fe7 100644
--- a/content/2_seasons/1_2024/2_spring-break/sbggpar6/xoi.txt
+++ b/content/2_seasons/1_2024/2_spring-break/sbggpar6/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://90CUYLfokdOm9Gw0
-- page://aHO5FUnIphBwYEjS
+Scorers:
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
+- 
+  member:
+    - page://aHO5FUnIphBwYEjS
 
 ----
 
diff --git a/content/2_seasons/1_2024/2_spring-break/tournament.txt b/content/2_seasons/1_2024/2_spring-break/tnmbrackets.txt
similarity index 100%
rename from content/2_seasons/1_2024/2_spring-break/tournament.txt
rename to content/2_seasons/1_2024/2_spring-break/tnmbrackets.txt
diff --git a/content/2_seasons/1_2024/2_spring-break/utbpew7l/xoi.txt b/content/2_seasons/1_2024/2_spring-break/utbpew7l/xoi.txt
index bc71f1d..b5274d6 100644
--- a/content/2_seasons/1_2024/2_spring-break/utbpew7l/xoi.txt
+++ b/content/2_seasons/1_2024/2_spring-break/utbpew7l/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://90CUYLfokdOm9Gw0
-- page://x8tm8FzBBY95HqIi
+Scorers:
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
+- 
+  member:
+    - page://x8tm8FzBBY95HqIi
 
 ----
 
diff --git a/content/2_seasons/1_2024/2_spring-break/zxlkihnz/xoi.txt b/content/2_seasons/1_2024/2_spring-break/zxlkihnz/xoi.txt
index 86e4ffc..4a2a5a5 100644
--- a/content/2_seasons/1_2024/2_spring-break/zxlkihnz/xoi.txt
+++ b/content/2_seasons/1_2024/2_spring-break/zxlkihnz/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://90CUYLfokdOm9Gw0
-- page://fShTMgFob20fogyr
+Scorers:
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
+- 
+  member:
+    - page://fShTMgFob20fogyr
 
 ----
 
diff --git a/content/2_seasons/1_2024/3_wm/1_1-runde/xoi.txt b/content/2_seasons/1_2024/3_wm/1_1-runde/xoi.txt
index e96f2f9..2153375 100644
--- a/content/2_seasons/1_2024/3_wm/1_1-runde/xoi.txt
+++ b/content/2_seasons/1_2024/3_wm/1_1-runde/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://TbZF36aHK27hZvnK
-- page://Ue0F1SstBqE7xVKr
+Scorers:
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
+- 
+  member:
+    - page://Ue0F1SstBqE7xVKr
 
 ----
 
diff --git a/content/2_seasons/1_2024/3_wm/2_2-runde/xoi.txt b/content/2_seasons/1_2024/3_wm/2_2-runde/xoi.txt
index 74e7a16..52354e3 100644
--- a/content/2_seasons/1_2024/3_wm/2_2-runde/xoi.txt
+++ b/content/2_seasons/1_2024/3_wm/2_2-runde/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://UkQNJytohCGIXySl
-- page://TbZF36aHK27hZvnK
+Scorers:
+- 
+  member:
+    - page://UkQNJytohCGIXySl
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
 
 ----
 
diff --git a/content/2_seasons/1_2024/3_wm/3_3-runde/xoi.txt b/content/2_seasons/1_2024/3_wm/3_3-runde/xoi.txt
index 931aca9..82a8ac1 100644
--- a/content/2_seasons/1_2024/3_wm/3_3-runde/xoi.txt
+++ b/content/2_seasons/1_2024/3_wm/3_3-runde/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://TbZF36aHK27hZvnK
-- page://xRomcRk5I5n4gkq5
+Scorers:
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
+- 
+  member:
+    - page://xRomcRk5I5n4gkq5
 
 ----
 
diff --git a/content/2_seasons/1_2024/3_wm/tournament.txt b/content/2_seasons/1_2024/3_wm/tnmbrackets.txt
similarity index 100%
rename from content/2_seasons/1_2024/3_wm/tournament.txt
rename to content/2_seasons/1_2024/3_wm/tnmbrackets.txt
diff --git a/content/2_seasons/1_2024/4_liga/0tdcwlko/xoi.txt b/content/2_seasons/1_2024/4_liga/0tdcwlko/xoi.txt
index 7b27c09..ba81076 100644
--- a/content/2_seasons/1_2024/4_liga/0tdcwlko/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/0tdcwlko/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://5bw1wQY8DAfxUVAw
-- page://5qeooGppOFqpprW5
+Scorers:
+
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
+- 
+  member:
+    - page://5qeooGppOFqpprW5
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/1csevwpm/xoi.txt b/content/2_seasons/1_2024/4_liga/1csevwpm/xoi.txt
index aaf15c0..e0c1875 100644
--- a/content/2_seasons/1_2024/4_liga/1csevwpm/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/1csevwpm/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://fShTMgFob20fogyr
-- page://UkQNJytohCGIXySl
+Scorers:
+
+- 
+  member:
+    - page://fShTMgFob20fogyr
+- 
+  member:
+    - page://UkQNJytohCGIXySl
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/4jujnos9/xoi.txt b/content/2_seasons/1_2024/4_liga/4jujnos9/xoi.txt
index 03a8343..00edfc3 100644
--- a/content/2_seasons/1_2024/4_liga/4jujnos9/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/4jujnos9/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://90CUYLfokdOm9Gw0
-- page://XDZibCkgJ9repYEx
+Scorers:
+
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/5s62p5jp/xoi.txt b/content/2_seasons/1_2024/4_liga/5s62p5jp/xoi.txt
index f46548e..3f3a3e4 100644
--- a/content/2_seasons/1_2024/4_liga/5s62p5jp/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/5s62p5jp/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://90CUYLfokdOm9Gw0
-- page://aHO5FUnIphBwYEjS
+Scorers:
+
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
+- 
+  member:
+    - page://aHO5FUnIphBwYEjS
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/_drafts/template/xoi.txt b/content/2_seasons/1_2024/4_liga/_drafts/template/xoi.txt
deleted file mode 100644
index e938b22..0000000
--- a/content/2_seasons/1_2024/4_liga/_drafts/template/xoi.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Title: Template
-
-----
-
-Max: 501
-
-----
-
-Sets: 1
-
-----
-
-Legs: 6
-
-----
-
-In: Straight
-
-----
-
-Out: Double
-
-----
-
-Players: 
-
-----
-
-Startdate: 
-
-----
-
-Enddate: 
-
-----
-
-Comment: 
-
-----
-
-Uuid: qXIhukwbcsAF6tuD
\ No newline at end of file
diff --git a/content/2_seasons/1_2024/4_liga/a4iulyd5/xoi.txt b/content/2_seasons/1_2024/4_liga/a4iulyd5/xoi.txt
index 2c27fbe..0a42562 100644
--- a/content/2_seasons/1_2024/4_liga/a4iulyd5/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/a4iulyd5/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://TbZF36aHK27hZvnK
-- page://7GAUHPdaKdD2sHm9
+Scorers:
+
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/a9z1tmvh/xoi.txt b/content/2_seasons/1_2024/4_liga/a9z1tmvh/xoi.txt
index 74320de..486ea60 100644
--- a/content/2_seasons/1_2024/4_liga/a9z1tmvh/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/a9z1tmvh/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://5bw1wQY8DAfxUVAw
-- page://UkQNJytohCGIXySl
+Scorers:
+
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
+- 
+  member:
+    - page://UkQNJytohCGIXySl
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/anobo58l/xoi.txt b/content/2_seasons/1_2024/4_liga/anobo58l/xoi.txt
index ad27c7d..b6b1348 100644
--- a/content/2_seasons/1_2024/4_liga/anobo58l/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/anobo58l/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://4CPpeIGeeK8UHTf8
-- page://7GAUHPdaKdD2sHm9
+Scorers:
+
+- 
+  member:
+    - page://4CPpeIGeeK8UHTf8
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/as5ijioi/xoi.txt b/content/2_seasons/1_2024/4_liga/as5ijioi/xoi.txt
index e9096ea..9c148d2 100644
--- a/content/2_seasons/1_2024/4_liga/as5ijioi/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/as5ijioi/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://Ue0F1SstBqE7xVKr
-- page://xRomcRk5I5n4gkq5
+Scorers:
+- 
+  member:
+    - page://Ue0F1SstBqE7xVKr
+- 
+  member:
+    - page://xRomcRk5I5n4gkq5
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/bx8cct6r/xoi.txt b/content/2_seasons/1_2024/4_liga/bx8cct6r/xoi.txt
index e73324e..c708840 100644
--- a/content/2_seasons/1_2024/4_liga/bx8cct6r/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/bx8cct6r/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://XDZibCkgJ9repYEx
-- page://7GAUHPdaKdD2sHm9
+Scorers:
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/cien2e5y/xoi.txt b/content/2_seasons/1_2024/4_liga/cien2e5y/xoi.txt
index 7478348..ceb492b 100644
--- a/content/2_seasons/1_2024/4_liga/cien2e5y/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/cien2e5y/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://fShTMgFob20fogyr
-- page://7GAUHPdaKdD2sHm9
+Scorers:
+- 
+  member:
+    - page://fShTMgFob20fogyr
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/cqeaezmg/xoi.txt b/content/2_seasons/1_2024/4_liga/cqeaezmg/xoi.txt
index 526abd7..5a11011 100644
--- a/content/2_seasons/1_2024/4_liga/cqeaezmg/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/cqeaezmg/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://aHO5FUnIphBwYEjS
-- page://5bw1wQY8DAfxUVAw
+Scorers:
+- 
+  member:
+    - page://aHO5FUnIphBwYEjS
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/eiwqlmue/xoi.txt b/content/2_seasons/1_2024/4_liga/eiwqlmue/xoi.txt
index 77a747e..429bb3f 100644
--- a/content/2_seasons/1_2024/4_liga/eiwqlmue/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/eiwqlmue/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://7GAUHPdaKdD2sHm9
-- page://5qeooGppOFqpprW5
+Scorers:
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
+- 
+  member:
+    - page://5qeooGppOFqpprW5
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/eqwdsia4/xoi.txt b/content/2_seasons/1_2024/4_liga/eqwdsia4/xoi.txt
index 3d59d20..d259859 100644
--- a/content/2_seasons/1_2024/4_liga/eqwdsia4/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/eqwdsia4/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://4CPpeIGeeK8UHTf8
-- page://TbZF36aHK27hZvnK
+Scorers:
+- 
+  member:
+    - page://4CPpeIGeeK8UHTf8
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/exgzkzyy/xoi.txt b/content/2_seasons/1_2024/4_liga/exgzkzyy/xoi.txt
index 8238a52..3f0e465 100644
--- a/content/2_seasons/1_2024/4_liga/exgzkzyy/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/exgzkzyy/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://x8tm8FzBBY95HqIi
-- page://XDZibCkgJ9repYEx
+Scorers:
+- 
+  member:
+    - page://x8tm8FzBBY95HqIi
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/gcysu6ge/xoi.txt b/content/2_seasons/1_2024/4_liga/gcysu6ge/xoi.txt
index 60e667c..7dae8bf 100644
--- a/content/2_seasons/1_2024/4_liga/gcysu6ge/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/gcysu6ge/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://5bw1wQY8DAfxUVAw
-- page://90CUYLfokdOm9Gw0
+Scorers:
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/gp3pj38u/xoi.txt b/content/2_seasons/1_2024/4_liga/gp3pj38u/xoi.txt
index 88c74df..40a6976 100644
--- a/content/2_seasons/1_2024/4_liga/gp3pj38u/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/gp3pj38u/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://aHO5FUnIphBwYEjS
-- page://7GAUHPdaKdD2sHm9
+Scorers:
+- 
+  member:
+    - page://aHO5FUnIphBwYEjS
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/iat8cs7j/xoi.txt b/content/2_seasons/1_2024/4_liga/iat8cs7j/xoi.txt
index 1b4ba3a..b0926af 100644
--- a/content/2_seasons/1_2024/4_liga/iat8cs7j/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/iat8cs7j/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://Ue0F1SstBqE7xVKr
-- page://7GAUHPdaKdD2sHm9
+Scorers:
+- 
+  member:
+    - page://Ue0F1SstBqE7xVKr
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/ix1srhrk/xoi.txt b/content/2_seasons/1_2024/4_liga/ix1srhrk/xoi.txt
index 126fe40..87c9257 100644
--- a/content/2_seasons/1_2024/4_liga/ix1srhrk/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/ix1srhrk/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://9S2pH2C0vG8XUrye
-- page://90CUYLfokdOm9Gw0
+Scorers:
+- 
+  member:
+    - page://9S2pH2C0vG8XUrye
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/jajnvwbu/xoi.txt b/content/2_seasons/1_2024/4_liga/jajnvwbu/xoi.txt
index 980d5ed..44ec69d 100644
--- a/content/2_seasons/1_2024/4_liga/jajnvwbu/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/jajnvwbu/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://TbZF36aHK27hZvnK
-- page://90CUYLfokdOm9Gw0
+Scorers:
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/kdcqpxs1/xoi.txt b/content/2_seasons/1_2024/4_liga/kdcqpxs1/xoi.txt
index 507c8d1..ec18b0c 100644
--- a/content/2_seasons/1_2024/4_liga/kdcqpxs1/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/kdcqpxs1/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://x8tm8FzBBY95HqIi
-- page://7GAUHPdaKdD2sHm9
+Scorers:
+- 
+  member:
+    - page://x8tm8FzBBY95HqIi
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/lziuhybw/xoi.txt b/content/2_seasons/1_2024/4_liga/lziuhybw/xoi.txt
index ece04a3..68fac3d 100644
--- a/content/2_seasons/1_2024/4_liga/lziuhybw/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/lziuhybw/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://7GAUHPdaKdD2sHm9
-- page://8TlbKlF7fVBwS24c
+Scorers:
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
+- 
+  member:
+    - page://8TlbKlF7fVBwS24c
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/mcjcgkbg/xoi.txt b/content/2_seasons/1_2024/4_liga/mcjcgkbg/xoi.txt
index e9f7d80..7eddddf 100644
--- a/content/2_seasons/1_2024/4_liga/mcjcgkbg/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/mcjcgkbg/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://90CUYLfokdOm9Gw0
-- page://5bw1wQY8DAfxUVAw
+Scorers:
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/olf1bjdm/xoi.txt b/content/2_seasons/1_2024/4_liga/olf1bjdm/xoi.txt
index 088b9a7..89c9870 100644
--- a/content/2_seasons/1_2024/4_liga/olf1bjdm/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/olf1bjdm/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://8TlbKlF7fVBwS24c
-- page://aHO5FUnIphBwYEjS
+Scorers:
+- 
+  member:
+    - page://8TlbKlF7fVBwS24c
+- 
+  member:
+    - page://aHO5FUnIphBwYEjS
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/ovasmz7s/xoi.txt b/content/2_seasons/1_2024/4_liga/ovasmz7s/xoi.txt
index eca5c9e..2c32da8 100644
--- a/content/2_seasons/1_2024/4_liga/ovasmz7s/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/ovasmz7s/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://9S2pH2C0vG8XUrye
-- page://TbZF36aHK27hZvnK
+Scorers:
+- 
+  member:
+    - page://9S2pH2C0vG8XUrye
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/rxwuanez/xoi.txt b/content/2_seasons/1_2024/4_liga/rxwuanez/xoi.txt
index 0a3adaf..180f276 100644
--- a/content/2_seasons/1_2024/4_liga/rxwuanez/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/rxwuanez/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://GZaBDcKmbMICoNZ8
-- page://4CPpeIGeeK8UHTf8
+Scorers:
+- 
+  member:
+    - page://GZaBDcKmbMICoNZ8
+- 
+  member:
+    - page://4CPpeIGeeK8UHTf8
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/sfln9xej/xoi.txt b/content/2_seasons/1_2024/4_liga/sfln9xej/xoi.txt
index 8faa70b..36678cb 100644
--- a/content/2_seasons/1_2024/4_liga/sfln9xej/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/sfln9xej/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://4CPpeIGeeK8UHTf8
-- page://5bw1wQY8DAfxUVAw
+Scorers:
+- 
+  member:
+    - page://4CPpeIGeeK8UHTf8
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/sgl9kqvo/xoi.txt b/content/2_seasons/1_2024/4_liga/sgl9kqvo/xoi.txt
index 5fb732e..c3ddf09 100644
--- a/content/2_seasons/1_2024/4_liga/sgl9kqvo/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/sgl9kqvo/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://9S2pH2C0vG8XUrye
-- page://7GAUHPdaKdD2sHm9
+Scorers:
+- 
+  member:
+    - page://9S2pH2C0vG8XUrye
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/tk69oajx/xoi.txt b/content/2_seasons/1_2024/4_liga/tk69oajx/xoi.txt
index fe3bb8e..a1a9044 100644
--- a/content/2_seasons/1_2024/4_liga/tk69oajx/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/tk69oajx/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://90CUYLfokdOm9Gw0
-- page://GZaBDcKmbMICoNZ8
+Scorers:
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
+- 
+  member:
+    - page://GZaBDcKmbMICoNZ8
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/tournament.txt b/content/2_seasons/1_2024/4_liga/tnmfreeforall.txt
similarity index 100%
rename from content/2_seasons/1_2024/4_liga/tournament.txt
rename to content/2_seasons/1_2024/4_liga/tnmfreeforall.txt
diff --git a/content/2_seasons/1_2024/4_liga/u3wssk4j/xoi.txt b/content/2_seasons/1_2024/4_liga/u3wssk4j/xoi.txt
index cf80f79..bfe96bf 100644
--- a/content/2_seasons/1_2024/4_liga/u3wssk4j/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/u3wssk4j/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://7GAUHPdaKdD2sHm9
-- page://90CUYLfokdOm9Gw0
+Scorers:
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/uslfpwja/xoi.txt b/content/2_seasons/1_2024/4_liga/uslfpwja/xoi.txt
index 4d863f8..78ade74 100644
--- a/content/2_seasons/1_2024/4_liga/uslfpwja/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/uslfpwja/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://UkQNJytohCGIXySl
-- page://XDZibCkgJ9repYEx
+Scorers:
+- 
+  member:
+    - page://UkQNJytohCGIXySl
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/ut3juonn/xoi.txt b/content/2_seasons/1_2024/4_liga/ut3juonn/xoi.txt
index 9e7aee1..ce80979 100644
--- a/content/2_seasons/1_2024/4_liga/ut3juonn/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/ut3juonn/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://Ue0F1SstBqE7xVKr
-- page://aHO5FUnIphBwYEjS
+Scorers:
+- 
+  member:
+    - page://Ue0F1SstBqE7xVKr
+- 
+  member:
+    - page://aHO5FUnIphBwYEjS
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/vmxmfxxs/xoi.txt b/content/2_seasons/1_2024/4_liga/vmxmfxxs/xoi.txt
index 66c5908..0726a23 100644
--- a/content/2_seasons/1_2024/4_liga/vmxmfxxs/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/vmxmfxxs/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://fShTMgFob20fogyr
-- page://TbZF36aHK27hZvnK
+Scorers:
+- 
+  member:
+    - page://fShTMgFob20fogyr
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/wksontke/xoi.txt b/content/2_seasons/1_2024/4_liga/wksontke/xoi.txt
index 78360d8..0a1d718 100644
--- a/content/2_seasons/1_2024/4_liga/wksontke/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/wksontke/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://TbZF36aHK27hZvnK
-- page://UkQNJytohCGIXySl
+Scorers:
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
+- 
+  member:
+    - page://UkQNJytohCGIXySl
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/wovzm0jh/xoi.txt b/content/2_seasons/1_2024/4_liga/wovzm0jh/xoi.txt
index c56735b..57f98cf 100644
--- a/content/2_seasons/1_2024/4_liga/wovzm0jh/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/wovzm0jh/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://x8tm8FzBBY95HqIi
-- page://5bw1wQY8DAfxUVAw
+Scorers:
+- 
+  member:
+    - page://x8tm8FzBBY95HqIi
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/wuhzwter/xoi.txt b/content/2_seasons/1_2024/4_liga/wuhzwter/xoi.txt
index 2508acf..a8ab436 100644
--- a/content/2_seasons/1_2024/4_liga/wuhzwter/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/wuhzwter/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://90CUYLfokdOm9Gw0
-- page://5qeooGppOFqpprW5
+Scorers:
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
+- 
+  member:
+    - page://5qeooGppOFqpprW5
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/xdadumtb/xoi.txt b/content/2_seasons/1_2024/4_liga/xdadumtb/xoi.txt
index 7ee8fd3..241e202 100644
--- a/content/2_seasons/1_2024/4_liga/xdadumtb/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/xdadumtb/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://5bw1wQY8DAfxUVAw
-- page://7GAUHPdaKdD2sHm9
+Scorers:
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/ypt4e90v/xoi.txt b/content/2_seasons/1_2024/4_liga/ypt4e90v/xoi.txt
index e3efe0d..defcf08 100644
--- a/content/2_seasons/1_2024/4_liga/ypt4e90v/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/ypt4e90v/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://5qeooGppOFqpprW5
-- page://9S2pH2C0vG8XUrye
+Scorers:
+- 
+  member:
+    - page://5qeooGppOFqpprW5
+- 
+  member:
+    - page://9S2pH2C0vG8XUrye
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/yw8a9zsz/xoi.txt b/content/2_seasons/1_2024/4_liga/yw8a9zsz/xoi.txt
index 7cddb7f..9bb3735 100644
--- a/content/2_seasons/1_2024/4_liga/yw8a9zsz/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/yw8a9zsz/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://5bw1wQY8DAfxUVAw
-- page://GZaBDcKmbMICoNZ8
+Scorers:
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
+- 
+  member:
+    - page://GZaBDcKmbMICoNZ8
 
 ----
 
diff --git a/content/2_seasons/1_2024/4_liga/zavij0ox/xoi.txt b/content/2_seasons/1_2024/4_liga/zavij0ox/xoi.txt
index 71e2a83..480fcf1 100644
--- a/content/2_seasons/1_2024/4_liga/zavij0ox/xoi.txt
+++ b/content/2_seasons/1_2024/4_liga/zavij0ox/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://9S2pH2C0vG8XUrye
-- page://5bw1wQY8DAfxUVAw
+Scorers:
+- 
+  member:
+    - page://9S2pH2C0vG8XUrye
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
 
 ----
 
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/256lip8t/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/256lip8t/xoi.txt
deleted file mode 100644
index 9bce95a..0000000
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/256lip8t/xoi.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Title: DIDO301
-
-----
-
-Max: 301
-
-----
-
-Sets: 1
-
-----
-
-Legs: 7
-
-----
-
-In: Double
-
-----
-
-Out: Double
-
-----
-
-Players: 
-
-----
-
-Startdate: 
-
-----
-
-Enddate: 
-
-----
-
-Comment: 
-
-----
-
-Uuid: aH5scdKjvS0IS3Jo
\ No newline at end of file
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/cvmylohu/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/cvmylohu/xoi.txt
deleted file mode 100644
index fa2b137..0000000
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/cvmylohu/xoi.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Title: Template
-
-----
-
-Max: 301
-
-----
-
-Sets: 1
-
-----
-
-Legs: 7
-
-----
-
-In: Double
-
-----
-
-Out: Double
-
-----
-
-Players: 
-
-----
-
-Startdate: 
-
-----
-
-Enddate: 
-
-----
-
-Comment: 
-
-----
-
-Uuid: yPPt29M3WHOZO7u1
\ No newline at end of file
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/hkz96vt7/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/hkz96vt7/xoi.txt
deleted file mode 100644
index fb9f868..0000000
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/hkz96vt7/xoi.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Title: DIDO301
-
-----
-
-Max: 301
-
-----
-
-Sets: 1
-
-----
-
-Legs: 7
-
-----
-
-In: Double
-
-----
-
-Out: Double
-
-----
-
-Players: 
-
-----
-
-Startdate: 
-
-----
-
-Enddate: 
-
-----
-
-Comment: 
-
-----
-
-Uuid: pKzyBEjOUz9c8ibP
\ No newline at end of file
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/ihap3lgd/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/ihap3lgd/xoi.txt
deleted file mode 100644
index 6a296ee..0000000
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/_drafts/ihap3lgd/xoi.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Title: DIDO301
-
-----
-
-Max: 301
-
-----
-
-Sets: 1
-
-----
-
-Legs: 7
-
-----
-
-In: Double
-
-----
-
-Out: Double
-
-----
-
-Players: 
-
-----
-
-Startdate: 
-
-----
-
-Enddate: 
-
-----
-
-Comment: 
-
-----
-
-Uuid: z35XfckvPvetLXWA
\ No newline at end of file
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/bux8rpm6/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/bux8rpm6/xoi.txt
index 643fdec..aa81a8c 100644
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/bux8rpm6/xoi.txt
+++ b/content/2_seasons/1_2024/5_autumn-grand-prix/bux8rpm6/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://5bw1wQY8DAfxUVAw
-- page://Ue0F1SstBqE7xVKr
+Scorers:
+- 
+  member:
+    - page://5bw1wQY8DAfxUVAw
+- 
+  member:
+    - page://Ue0F1SstBqE7xVKr
 
 ----
 
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/ce4fqjwm/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/ce4fqjwm/xoi.txt
index 7d7d21e..314be1c 100644
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/ce4fqjwm/xoi.txt
+++ b/content/2_seasons/1_2024/5_autumn-grand-prix/ce4fqjwm/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://fShTMgFob20fogyr
-- page://90CUYLfokdOm9Gw0
+Scorers:
+- 
+  member:
+    - page://fShTMgFob20fogyr
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
 
 ----
 
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/guuanotg/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/guuanotg/xoi.txt
index 834f3df..0d5ce79 100644
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/guuanotg/xoi.txt
+++ b/content/2_seasons/1_2024/5_autumn-grand-prix/guuanotg/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://XDZibCkgJ9repYEx
-- page://x8tm8FzBBY95HqIi
+Scorers:
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
+- 
+  member:
+    - page://x8tm8FzBBY95HqIi
 
 ----
 
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/ivwhmdoe/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/ivwhmdoe/xoi.txt
index f55630d..d12a535 100644
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/ivwhmdoe/xoi.txt
+++ b/content/2_seasons/1_2024/5_autumn-grand-prix/ivwhmdoe/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://90CUYLfokdOm9Gw0
-- page://GZaBDcKmbMICoNZ8
+Scorers:
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
+- 
+  member:
+    - page://GZaBDcKmbMICoNZ8
 
 ----
 
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/jfyjddui/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/jfyjddui/xoi.txt
index 88764b8..ffcd406 100644
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/jfyjddui/xoi.txt
+++ b/content/2_seasons/1_2024/5_autumn-grand-prix/jfyjddui/xoi.txt
@@ -22,10 +22,14 @@ Out: Double
 
 ----
 
-Players:
-
-- page://fShTMgFob20fogyr
-- page://x8tm8FzBBY95HqIi
+Scorers:
+
+- 
+  member:
+    - page://fShTMgFob20fogyr
+- 
+  member:
+    - page://x8tm8FzBBY95HqIi
 
 ----
 
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/jzc8jx4x/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/jzc8jx4x/xoi.txt
index 0103def..aa670b9 100644
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/jzc8jx4x/xoi.txt
+++ b/content/2_seasons/1_2024/5_autumn-grand-prix/jzc8jx4x/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://Ue0F1SstBqE7xVKr
-- page://fShTMgFob20fogyr
+Scorers:
+- 
+  member:
+    - page://Ue0F1SstBqE7xVKr
+- 
+  member:
+    - page://fShTMgFob20fogyr
 
 ----
 
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/miuxwlp4/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/miuxwlp4/xoi.txt
deleted file mode 100644
index ea1b21f..0000000
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/miuxwlp4/xoi.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Title: DIDO301
-
-----
-
-Max: 301
-
-----
-
-Sets: 1
-
-----
-
-Legs: 7
-
-----
-
-In: Double
-
-----
-
-Out: Double
-
-----
-
-Players: 
-
-----
-
-Startdate: 
-
-----
-
-Enddate: 
-
-----
-
-Comment: 
-
-----
-
-Uuid: p3POP6ilQfWDlSUX
\ No newline at end of file
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/ngdfd5sd/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/ngdfd5sd/xoi.txt
index 83f1db2..f619a99 100644
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/ngdfd5sd/xoi.txt
+++ b/content/2_seasons/1_2024/5_autumn-grand-prix/ngdfd5sd/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://xRomcRk5I5n4gkq5
-- page://XDZibCkgJ9repYEx
+Scorers:
+- 
+  member:
+    - page://xRomcRk5I5n4gkq5
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
 
 ----
 
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/pnyxwihz/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/pnyxwihz/xoi.txt
index 6d13c3c..decd4ed 100644
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/pnyxwihz/xoi.txt
+++ b/content/2_seasons/1_2024/5_autumn-grand-prix/pnyxwihz/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://x8tm8FzBBY95HqIi
-- page://4CPpeIGeeK8UHTf8
+Scorers:
+- 
+  member:
+    - page://x8tm8FzBBY95HqIi
+- 
+  member:
+    - page://4CPpeIGeeK8UHTf8
 
 ----
 
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/q42hp0bn/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/q42hp0bn/xoi.txt
index bf40675..2e4e7b5 100644
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/q42hp0bn/xoi.txt
+++ b/content/2_seasons/1_2024/5_autumn-grand-prix/q42hp0bn/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://XDZibCkgJ9repYEx
-- page://TbZF36aHK27hZvnK
+Scorers:
+- 
+  member:
+    - page://XDZibCkgJ9repYEx
+- 
+  member:
+    - page://TbZF36aHK27hZvnK
 
 ----
 
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/tournament.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/tnmbrackets.txt
similarity index 100%
rename from content/2_seasons/1_2024/5_autumn-grand-prix/tournament.txt
rename to content/2_seasons/1_2024/5_autumn-grand-prix/tnmbrackets.txt
diff --git a/content/2_seasons/1_2024/5_autumn-grand-prix/yrb4yey6/xoi.txt b/content/2_seasons/1_2024/5_autumn-grand-prix/yrb4yey6/xoi.txt
index de6a4ee..6e2a4dc 100644
--- a/content/2_seasons/1_2024/5_autumn-grand-prix/yrb4yey6/xoi.txt
+++ b/content/2_seasons/1_2024/5_autumn-grand-prix/yrb4yey6/xoi.txt
@@ -22,10 +22,13 @@ Out: Double
 
 ----
 
-Players:
-
-- page://7GAUHPdaKdD2sHm9
-- page://GZaBDcKmbMICoNZ8
+Scorers:
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
+- 
+  member:
+    - page://GZaBDcKmbMICoNZ8
 
 ----
 
diff --git a/content/2_seasons/1_2024/6_christmas/tnmteambrackets.txt b/content/2_seasons/1_2024/6_christmas/tnmteambrackets.txt
new file mode 100644
index 0000000..f00c729
--- /dev/null
+++ b/content/2_seasons/1_2024/6_christmas/tnmteambrackets.txt
@@ -0,0 +1,42 @@
+Title: Christmas
+
+----
+
+Participants:
+
+- 
+  member:
+    - page://7GAUHPdaKdD2sHm9
+    - page://Jz127lCNtxHgUj2b
+- 
+  member:
+    - page://90CUYLfokdOm9Gw0
+    - page://CRQRBY9Ac3tXXQse
+- 
+  member:
+    - page://GZaBDcKmbMICoNZ8
+    - page://5bw1wQY8DAfxUVAw
+- 
+  member:
+    - page://fShTMgFob20fogyr
+    - page://xRomcRk5I5n4gkq5
+- 
+  member:
+    - page://5qeooGppOFqpprW5
+    - page://XDZibCkgJ9repYEx
+
+----
+
+Date: 2024-12-14
+
+----
+
+Default: - page://caLr6s1GrTQpYNvj
+
+----
+
+Duo: true
+
+----
+
+Uuid: BQqZYReH6e489II3
\ No newline at end of file
diff --git a/content/2_seasons/1_2024/season.txt b/content/2_seasons/1_2024/season.txt
index 254a6c1..c378630 100644
--- a/content/2_seasons/1_2024/season.txt
+++ b/content/2_seasons/1_2024/season.txt
@@ -1,4 +1,4 @@
-Title: Season 2024
+Title: 2024
 
 ----
 
diff --git a/content/3_templates/_drafts/dido301/xoi.txt b/content/3_templates/_drafts/dido301/xoi.txt
index d322bd9..b4285f9 100644
--- a/content/3_templates/_drafts/dido301/xoi.txt
+++ b/content/3_templates/_drafts/dido301/xoi.txt
@@ -1,4 +1,4 @@
-Title: DIDO301
+Title: DIDO 301
 
 ----
 
@@ -22,7 +22,7 @@ Out: Double
 
 ----
 
-Players: 
+Scorers: 
 
 ----
 
diff --git a/content/3_templates/_drafts/dodo501bof6/xoi.txt b/content/3_templates/_drafts/dodo501bof6/xoi.txt
index ee2b5e8..20e0242 100644
--- a/content/3_templates/_drafts/dodo501bof6/xoi.txt
+++ b/content/3_templates/_drafts/dodo501bof6/xoi.txt
@@ -1,4 +1,4 @@
-Title: SIDO501Bof6
+Title: SIDO 501 Bof 6
 
 ----
 
@@ -22,7 +22,7 @@ Out: Double
 
 ----
 
-Players: 
+Scorers: 
 
 ----
 
diff --git a/content/3_templates/_drafts/dodo501bof7/xoi.txt b/content/3_templates/_drafts/dodo501bof7/xoi.txt
index 386f431..4ade2af 100644
--- a/content/3_templates/_drafts/dodo501bof7/xoi.txt
+++ b/content/3_templates/_drafts/dodo501bof7/xoi.txt
@@ -1,4 +1,4 @@
-Title: SIDO501Bof7
+Title: SIDO 501 Bof 7
 
 ----
 
@@ -26,7 +26,7 @@ Out: Double
 
 ----
 
-Players: 
+Scorers: 
 
 ----
 
diff --git a/site/blueprints/pages/season.yml b/site/blueprints/pages/season.yml
index a5fdf2a..a2a5c2a 100644
--- a/site/blueprints/pages/season.yml
+++ b/site/blueprints/pages/season.yml
@@ -7,6 +7,9 @@ sections:
   pages:
     type: pages
     label: Tournaments
-    template: tournament
+    templates: 
+      - tnmbrackets
+      - tnmteambrackets
+      - tnmfreeforall
     # text: "{{ page.type }} {{ page.surname }} <em>({{ page.nickname }})</em>"
     # sortBy: page.surname
diff --git a/site/blueprints/pages/tnmbrackets.yml b/site/blueprints/pages/tnmbrackets.yml
new file mode 100644
index 0000000..7a84055
--- /dev/null
+++ b/site/blueprints/pages/tnmbrackets.yml
@@ -0,0 +1,3 @@
+title: Tournament Brackets
+
+extends: pages/tournament
\ No newline at end of file
diff --git a/site/blueprints/pages/tnmfreeforall.yml b/site/blueprints/pages/tnmfreeforall.yml
new file mode 100644
index 0000000..6940e8d
--- /dev/null
+++ b/site/blueprints/pages/tnmfreeforall.yml
@@ -0,0 +1,3 @@
+title: Tournament Free for All
+
+extends: pages/tournament
\ No newline at end of file
diff --git a/site/blueprints/pages/tnmteambrackets.yml b/site/blueprints/pages/tnmteambrackets.yml
new file mode 100644
index 0000000..2de7ca9
--- /dev/null
+++ b/site/blueprints/pages/tnmteambrackets.yml
@@ -0,0 +1,24 @@
+title: Tournament Team Brackets
+
+extends: pages/tournament
+
+
+sections:
+  fields:
+    type: fields
+    fields:
+      participants:
+        label: Teams
+        type: structure
+        sortBy: title desc
+        fields:
+          member:
+              label: Members
+              text: "{{ page.forename }} {{ page.surname }} <em>({{ page.nickname }})</em>"
+              type: pages
+              sortBy: number asc
+              query: site.find('members').children.sortBy('forename', 'asc')
+              max: 2
+              limit: 10
+  pages:
+    text: "[{{ page.startdate.toDate('d.m.') }}] {{ page.scorers.toStructure.nth(0).member.toPages.nth(0).forename }} + {{ page.scorers.toStructure.nth(0).member.toPages.nth(1).forename }} vs. {{ page.scorers.toStructure.nth(1).member.toPages.nth(0).forename }} + {{ page.scorers.toStructure.nth(1).member.toPages.nth(1).forename }}"
diff --git a/site/blueprints/pages/tournament.yml b/site/blueprints/pages/tournament.yml
index 765c239..fcdf92d 100644
--- a/site/blueprints/pages/tournament.yml
+++ b/site/blueprints/pages/tournament.yml
@@ -8,14 +8,15 @@ sections:
     type: fields
     fields:
       participants:
-        width: 1/2
+        width: 9/12
         label: Participants
         type: pages
-        query: site.find('members')
+        sortBy: number asc
+        query: site.find('members').children.sortBy('forename', 'asc')
         text: "{{ page.forename }} {{ page.surname }} <em>({{ page.nickname }})</em>"
       date:
-        width: 1/2
-        label: Date
+        width: 3/12
+        label: End Date
         type: date
       default:
         width: 1/1
@@ -23,25 +24,10 @@ sections:
         type: pages
         max: 1
         query: site.find("Templates").drafts
-      # layout:
-      #   type: layout
-      #   layouts:
-      #     - "1/6, 1/6, 1/6, 1/6, 1/6, 1/6"
-      #   fieldsets:
-      #     - heading
-      #     - simple_game
   pages:
     type: pages
     label: Games
     template: xoi
-    text: "[{{ page.startdate.toDate('d.m.') }}] {{ page.players.toPages.first.forename }} {{ page.players.toPages.first.surname }} vs. {{ page.players.toPages.nth(1).forename }} {{ page.players.toPages.nth(1).surname }}"
+    text: "[{{ page.startdate.toDate('d.m.') }}] {{ page.scorers.toStructure.nth(0).member.toPages.nth(0).forename }} {{ page.scorers.toStructure.nth(0).member.toPages.nth(0).surname }} vs. {{ page.scorers.toStructure.nth(1).member.toPages.nth(0).forename }} {{ page.scorers.toStructure.nth(1).member.toPages.nth(0).surname }}"
     sortBy: startdate desc
     status: unlisted
-  # pages2:
-  #   type: pages
-  #   label: Default
-  #   template: xoi
-  #   sortBy: startdate desc
-  #   status: draft
-  #   max: 1
-  #   limit: 1
diff --git a/site/blueprints/pages/xoi.yml b/site/blueprints/pages/xoi.yml
index 354a924..4c05e44 100644
--- a/site/blueprints/pages/xoi.yml
+++ b/site/blueprints/pages/xoi.yml
@@ -44,13 +44,27 @@ sections:
           - "Straight"
           - "Double"
           - "Master"
-      players:
+      scorers:
         width: 6/12
-        label: Players
-        type: pages
-        multiple: true
-        query: site.find('members')
-        text: "{{ page.forename }} {{ page.surname }} <em>({{ page.nickname }})</em>"
+        label: Scorer
+        type: structure
+        sortBy: title desc
+        fields:
+          member:
+              label: Members
+              text: "{{ page.forename }} {{ page.surname }} <em>({{ page.nickname }})</em>"
+              type: pages
+              sortBy: number asc
+              query: site.find('members').children.sortBy('forename', 'asc')
+              max: 2
+              limit: 10
+      # players:
+      #   width: 6/12
+      #   label: Players
+      #   type: pages
+      #   multiple: true
+      #   query: site.find('members')
+      #   text: "{{ page.forename }} {{ page.surname }} <em>({{ page.nickname }})</em>"
       startdate:
         width: 6/12
         label: Start
diff --git a/site/blueprints/site.yml b/site/blueprints/site.yml
index b7da661..cf789f0 100644
--- a/site/blueprints/site.yml
+++ b/site/blueprints/site.yml
@@ -3,3 +3,4 @@ title: Site
 sections:
   pages:
     type: pages
+    status: listed
diff --git a/site/blueprints/users/default.yml b/site/blueprints/users/default.yml
new file mode 100644
index 0000000..b680d89
--- /dev/null
+++ b/site/blueprints/users/default.yml
@@ -0,0 +1,44 @@
+title: Member
+
+create:
+  title:
+    label: Member ID
+  fields:
+    - forename
+    - surname
+    - nickname
+    - number
+  redirect: false
+  status: listed
+
+# columns:
+#   main:
+#     width: 2/3
+sections:
+  fields:
+    type: fields
+    fields:
+      forename:
+        label: First name
+        type: text
+        width: 1/6
+      surname:
+        label: Last Name
+        type: text
+        width: 1/6
+      nickname:
+        label: Nickname
+        type: text
+        width: 2/6
+      number:
+        label: Number
+        type: number
+        width: 1/6
+      pic:
+        label: Picture
+        type: files
+        width: 1/6
+        multiple: false
+        query: user.images
+      files:
+        type: files
diff --git a/site/controllers/xoi.php b/site/controllers/xoi.php
index b7b3c05..e933465 100644
--- a/site/controllers/xoi.php
+++ b/site/controllers/xoi.php
@@ -1,134 +1,178 @@
 <?php
-use Kirby\Cms\Page;
+// use Kirby\Cms\Page;
 
-// more validation is needed
-function addThrows($page, $site, $kirby){
-  $json["status"] = "ok";
-  $error = "";
-  if (!$page->enddate()->isEmpty()) {
-    $error = "Game ended";
-    $json["status"] = "error";
-    $json["error"] = $error;
-    return $json;
-  }
-  $throws = $kirby->request()->get("throws");
-  if (is_null($throws) || !is_array($throws)) {
-    $error = "You have to pass throws as array";
-    if ($error != "") {
-      $json["status"] = "error";
-      $json["error"] = $error;
-    }
-    return $json;
-  }
-  $checkoutTries = $kirby->request()->get("checkoutTries") ? intval($kirby->request()->get("checkoutTries")) : 0;
-  $done = $kirby->request()->get("done");
-  $numDarts = 3;
-  if ($kirby->request()->get("numDarts")) {
-    $numDarts = intval($kirby->request()->get("numDarts"));
-  } elseif (!$done) {
-    $numDarts = count($throws);
-  }
-  try {
-    $page->addThrows($throws, $numDarts, $checkoutTries, $done);
-  } catch (\Exception $e) {
-    $error = $e->getMessage();
-  }
-  if ($error != "") {
-    $json["status"] = "error";
-    $json["error"] = $error;
-  }
-  return $json;
-}
+// // more validation is needed
+// function addThrows($page, $site, $kirby){
+//   $json["status"] = "ok";
+//   $error = "";
+//   if (!$page->enddate()->isEmpty()) {
+//     $error = "Game ended";
+//     $json["status"] = "error";
+//     $json["error"] = $error;
+//     return $json;
+//   }
+//   $throws = $kirby->request()->get("throws");
+//   if (is_null($throws) || !is_array($throws)) {
+//     $error = "You have to pass throws as array";
+//     if ($error != "") {
+//       $json["status"] = "error";
+//       $json["error"] = $error;
+//     }
+//     return $json;
+//   }
+//   $checkoutTries = $kirby->request()->get("checkoutTries") ? intval($kirby->request()->get("checkoutTries")) : 0;
+//   $done = $kirby->request()->get("done");
+//   $numDarts = 3;
+//   if ($kirby->request()->get("numDarts")) {
+//     $numDarts = intval($kirby->request()->get("numDarts"));
+//   } elseif (!$done) {
+//     $numDarts = count($throws);
+//   }
+//   try {
+//     $page->addThrows($throws, $numDarts, $checkoutTries, $done);
+//   } catch (\Exception $e) {
+//     $error = $e->getMessage();
+//   }
+//   if ($error != "") {
+//     $json["status"] = "error";
+//     $json["error"] = $error;
+//   }
+//   return $json;
+// }
 
-function deleteLastThrow($page, $site, $kirby){
-  $json["status"] = "ok";
-  $error = "";
-  if (!$page->enddate()->isEmpty()) {
-    $error = "Game ended";
-    $json["status"] = "error";
-    $json["error"] = $error;
-    return $json;
-  }
-  $game = $page->rounds()->parseJSON();
-  $set = &$game["sets"][count($game["sets"])-1];
-  $leg = &$set["legs"][count($set["legs"])-1];
-  $visit = &$leg["visits"][count($leg["visits"])-1];
+// function deleteLastThrow($page, $site, $kirby){
+//   $json["status"] = "ok";
+//   $error = "";
+//   if (!$page->enddate()->isEmpty()) {
+//     $error = "Game ended";
+//     $json["status"] = "error";
+//     $json["error"] = $error;
+//     return $json;
+//   }
+//   $game = $page->rounds()->parseJSON();
+//   $set = &$game["sets"][count($game["sets"])-1];
+//   $leg = &$set["legs"][count($set["legs"])-1];
+//   $visit = &$leg["visits"][count($leg["visits"])-1];
 
-  $completeVisit = $kirby->request()->get("visit");
-  if (count($visit['throws']) > 0 && !$completeVisit) {
-    array_pop($visit['throws']);
-    $kirby->impersonate('kirby');
-    $page = $page->update([
-      'rounds' => json_encode($game),
-    ]);
-  } else {
-    // delete last visit. This means, delete 2 lasts and insert one.
-    array_pop($leg["visits"]);
-    if (count($leg["visits"]) == 0){
-      array_pop($set["legs"]);
-      if (count($set["legs"]) == 0){
-        array_pop($game["sets"]);
-        if (count($game["sets"]) == 0){
-          $page = $page->initGame(false);
-          $page->recalcStats();
-          return $json;
-        }
-      }
-    }
-    $kirby->impersonate('kirby');
-    $page = $page->update([
-      'rounds' => json_encode($game),
-    ]);
-    $page = $page->clearLastVisit();
-  }
-  $page = $page->recalcStats();
-  if ($error != "") {
-    $json["status"] = "error";
-    $json["error"] = $error;
-  }
-  return $json;
-}
+//   $completeVisit = $kirby->request()->get("visit");
+//   if (count($visit['throws']) > 0 && !$completeVisit) {
+//     array_pop($visit['throws']);
+//     $kirby->impersonate('kirby');
+//     $page = $page->update([
+//       'rounds' => json_encode($game),
+//     ]);
+//   } else {
+//     // delete last visit. This means, delete 2 lasts and insert one.
+//     array_pop($leg["visits"]);
+//     if (count($leg["visits"]) == 0){
+//       array_pop($set["legs"]);
+//       if (count($set["legs"]) == 0){
+//         array_pop($game["sets"]);
+//         if (count($game["sets"]) == 0){
+//           $page = $page->initGame(false);
+//           $page->recalcStats();
+//           return $json;
+//         }
+//       }
+//     }
+//     $kirby->impersonate('kirby');
+//     $page = $page->update([
+//       'rounds' => json_encode($game),
+//     ]);
+//     $page = $page->clearLastVisit();
+//   }
+//   $page = $page->recalcStats();
+//   if ($error != "") {
+//     $json["status"] = "error";
+//     $json["error"] = $error;
+//   }
+//   return $json;
+// }
 
-function init($page, $site, $kirby){
-  $json["status"] = "ok";
-  $error = "";
-  if ($page->rounds()->toString() != "") {
-    $error = "Game already started, can not update";
-    $json["status"] = "error";
-    $json["error"] = $error;
-    return $json;
-  }
-  $players = $kirby->request()->get("players");
-  if (is_null($players) || !is_array($players) || count($players) == 0)  {
-    $error = "Players not given.";
-    $json["status"] = "error";
-    $json["error"] = $error;
-    return $json;
-  }
-  foreach ($players as $i => $player) {
-    try {
-      if (page($player)->intendedTemplate() != "member") {
-        $error = "Player is not a member ".page($player)->template();
-        $json["status"] = "error";
-        $json["error"] = $error;
-        return $json;
-      }
-    } catch (\Exception $e) {
-      $error = "Player not found".$e;
-      $json["status"] = "error";
-      $json["error"] = $error;
-      return $json;
-    }
-  }
-  $page = $page->reorderPlayer($players);
-  $page->initGame();
+// function init($page, $site, $kirby){
+//   $json["status"] = "ok";
+//   $error = "";
+//   if ($page->rounds()->toString() != "") {
+//     $error = "Game already started, can not update";
+//     $json["status"] = "error";
+//     $json["error"] = $error;
+//     return $json;
+//   }
+//   $players = $kirby->request()->get("players");
+//   if (is_null($players) || !is_array($players) || count($players) == 0)  {
+//     $error = "Players not given.";
+//     $json["status"] = "error";
+//     $json["error"] = $error;
+//     return $json;
+//   }
+//   foreach ($players as $i => $player) {
+//     try {
+//       if (page($player)->intendedTemplate() != "member") {
+//         $error = "Player is not a member ".page($player)->template();
+//         $json["status"] = "error";
+//         $json["error"] = $error;
+//         return $json;
+//       }
+//     } catch (\Exception $e) {
+//       $error = "Player not found".$e;
+//       $json["status"] = "error";
+//       $json["error"] = $error;
+//       return $json;
+//     }
+//   }
+//   $page = $page->reorderPlayer($players);
+//   $page->initGame();
 
-  if ($error != "") {
-    $json["status"] = "error";
-    $json["error"] = $error;
-  }
-  return $json;
-}
+//   if ($error != "") {
+//     $json["status"] = "error";
+//     $json["error"] = $error;
+//   }
+//   return $json;
+// }
+
+// function update($page, $site, $kirby){
+//   $json["status"] = "ok";
+//   $error = "";
+
+//   // TODO check data for valid fields
+//   $kirby->impersonate('kirby');
+//   $data = $kirby->request()->get("data");
+//   $page = $page->update($data);
+
+//   if ($error != "") {
+//     $json["status"] = "error";
+//     $json["error"] = $error;
+//   }
+//   return $json;
+// }
+
+// return function ($page, $site, $kirby) {
+//   $error = "";
+//   $json = [];
+//   $type = "html";
+//   if ($kirby->request()->is('POST')) {
+//     $type = "json";
+//     $action = $kirby->request()->get("action");
+//     if ($action == "update") {
+//       $json = update($page, $site, $kirby);
+//     } elseif ($action == "init") {
+//       $json = init($page, $site, $kirby);
+//     } elseif ($action == "addThrows") {
+//       $json = addThrows($page, $site, $kirby);
+//     } elseif ($action == "deleteLastThrow") {
+//       $json = deleteLastThrow($page, $site, $kirby);
+//     } else {
+//       $json["error"] = "No known action defined";
+//       $json["status"] = "error";
+//     }
+//   }
+
+//   return [
+//     'type' => $type,
+//     'json' => $json,
+//     'error' => $error
+//   ];
+// };
 
 function update($page, $site, $kirby){
   $json["status"] = "ok";
@@ -155,12 +199,6 @@ return function ($page, $site, $kirby) {
     $action = $kirby->request()->get("action");
     if ($action == "update") {
       $json = update($page, $site, $kirby);
-    } elseif ($action == "init") {
-      $json = init($page, $site, $kirby);
-    } elseif ($action == "addThrows") {
-      $json = addThrows($page, $site, $kirby);
-    } elseif ($action == "deleteLastThrow") {
-      $json = deleteLastThrow($page, $site, $kirby);
     } else {
       $json["error"] = "No known action defined";
       $json["status"] = "error";
@@ -172,4 +210,4 @@ return function ($page, $site, $kirby) {
     'json' => $json,
     'error' => $error
   ];
-};
+};
\ No newline at end of file
diff --git a/site/models/0_tournament.php b/site/models/0_tournament.php
new file mode 100644
index 0000000..0a5f75d
--- /dev/null
+++ b/site/models/0_tournament.php
@@ -0,0 +1,63 @@
+<?php
+
+use Kirby\Cms\Structure;
+
+trait tournament {
+  /**
+   * @kql-allowed
+   */
+  public function getRunningGames() {
+    return $this->children()->filter(
+      fn ($child) => $child->enddate()->isEmpty()
+    );
+  }
+
+  /**
+   * @kql-allowed
+   */
+  public function getStats($uuid) {
+    $games = $this->children()->filter(
+      fn ($child) => count($child->flatScorers()->filter( fn ($player) => $player->uuid()->toString() == $uuid ) )
+    );
+    $statsSum = [];
+    foreach ($games as $key => $game) {
+      if ($game->stats()->isEmpty() || $game->enddate()->isEmpty()) {
+        continue;
+      }
+      $stats = $game->stats()->parseJSON()["stats"];
+      $i = -1;
+      foreach ($stats as $k => $stat) {
+        if ($stat["player"] == $uuid) {
+          $i = $k;
+          break;
+        }  
+      }
+      if ($i == -1){
+        continue;
+      }
+      if (count($statsSum) == 0){
+        $statsSum = $stats[$i];
+        continue;
+      }
+      $statsSum = $game->addStats($statsSum, $stats[$i]);
+    }
+    return $statsSum;//$lol;//$stats[1]["player"]$player->uuid()->toString();
+  }
+
+  /**
+   * @kql-allowed
+   */
+  public function scorers() {
+    try {
+      $scorers = $this->participants()->toStructure();
+      return $scorers;
+    } catch (\Throwable $th) {
+      return Structure::factory(
+        array_values($this->participants()->toPages()->sortBy('forename')->toArray(function($elem){
+          return array("member" => array($elem->uuid()->toString()));
+        })),
+        ['parent' => $this, 'field' => $this->participants()]
+      );
+    }
+  }
+}
diff --git a/site/models/tnmbrackets.php b/site/models/tnmbrackets.php
new file mode 100644
index 0000000..c26ee16
--- /dev/null
+++ b/site/models/tnmbrackets.php
@@ -0,0 +1,5 @@
+<?php
+
+class TnmbracketsPage extends Page {
+    use tournament;
+}
diff --git a/site/models/tnmfreeforall.php b/site/models/tnmfreeforall.php
new file mode 100644
index 0000000..0132cbc
--- /dev/null
+++ b/site/models/tnmfreeforall.php
@@ -0,0 +1,5 @@
+<?php
+
+class TnmfreeforallPage extends Page {
+    use tournament;
+}
diff --git a/site/models/tnmteambrackets.php b/site/models/tnmteambrackets.php
new file mode 100644
index 0000000..d0b5735
--- /dev/null
+++ b/site/models/tnmteambrackets.php
@@ -0,0 +1,5 @@
+<?php
+
+class TnmteambracketsPage extends Page {
+    use tournament;
+}
diff --git a/site/models/tournament.php b/site/models/tournament.php
deleted file mode 100644
index 654890b..0000000
--- a/site/models/tournament.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-class TournamentPage extends Page {
-  /**
-   * @kql-allowed
-   */
-  public function getRunningGames() {
-    return $this->children()->filter(
-      fn ($child) => $child->enddate()->isEmpty()
-    );
-  }
-
-  /**
-   * @kql-allowed
-   */
-  public function getStats($uuid) {
-    $lol = $this->children()->filter(
-      fn ($child) => count($child->players()->toPages()->filter( fn ($player) => $player->uuid()->toString() == $uuid ) )
-    );
-    $statsSum = [];
-    foreach ($lol as $key => $value) {
-      if ($value->stats()->isEmpty()) {
-        continue;
-      }
-      $stats = $value->stats()->parseJSON()["stats"];
-      if ($stats[0]["player"] == $uuid) {
-        $i = 0;
-      } else if ($stats[1]["player"] == $uuid) {
-        $i = 1;
-      }
-      if (count($statsSum) == 0){
-        $statsSum = $stats[$i];
-        continue;
-      }
-      $statsSum = $value->addStats($statsSum, $stats[$i]);
-    }
-    return $statsSum;//$lol;//$stats[1]["player"]$player->uuid()->toString();
-  }
-}
diff --git a/site/models/xoi.php b/site/models/xoi.php
index d42bc65..8bc7b7d 100644
--- a/site/models/xoi.php
+++ b/site/models/xoi.php
@@ -32,11 +32,13 @@ class XoiPage extends Page {
    * @kql-allowed
    */
   public function tournamentStats() {
-    if (count($this->playerUUIDs()) == 2){
-        return [$this->parent()->getStats($this->playerUUIDs()[0]),$this->parent()->getStats($this->playerUUIDs()[1])];
+    $stats = [];
+    foreach ($this->playerUUIDs() as $k => $p) {
+      $stats[] = $this->parent()->getStats($p);
     }
-    return [];
+    return $stats;
   }
+
   //
   // public function reorderPlayer($order){
   //   kirby()->impersonate('kirby');
@@ -44,8 +46,17 @@ class XoiPage extends Page {
   //     "players" => $order
   //   ]);
   // }
+  public function flatScorers(){
+    $pp = $this->scorers()->toStructure();
+    $players = new Pages();
+    foreach ($pp as $i => $p) {
+      $players->add($p->member()->toPages());
+    }
+    return $players;
+  }
+
   public function playerUUIDs(){
-    $pp = $this->players()->toPages();
+    $pp = $this->flatScorers();
     $players = [];
     foreach ($pp as $i => $p) {
       $players[] = $p->uuid()->toString();
@@ -104,17 +115,17 @@ class XoiPage extends Page {
   //   return $stats;
   // }
   //
-  private function newVisit($player, $round)
-  {
-    return array(
-      'player' => $player,
-      'throws' => [],
-      'visit' => $round,
-      'checkoutTries' => 0,
-      'checkinTries' => 0,
-      'numDarts' => 0,
-    );
-  }
+  // private function newVisit($player, $round)
+  // {
+  //   return array(
+  //     'player' => $player,
+  //     'throws' => [],
+  //     'visit' => $round,
+  //     'checkoutTries' => 0,
+  //     'checkinTries' => 0,
+  //     'numDarts' => 0,
+  //   );
+  // }
   //
   // public function calcPoints($throw)
   // {
@@ -278,34 +289,34 @@ class XoiPage extends Page {
   //   $page->update($update);
   // }
 
-  private function newSingleStats($player)
-  {
-    return array(
-      "player" => $player,
-      "average" => [0, 0],
-      "first9" => [0, 0],
-      "checkouts" => [0, 0],
-      "checkoutPoints" => [],
-      "checkins" => [0, 0],
-      "checkinPoints" => [],
-      "60+" => 0,
-      "100+" => 0,
-      "140+" => 0,
-      "180" => 0
-    );
-  }
-  private function newStats(){
-    $playerUUIDs = $this->playerUUIDs();
-    $stats = array(
-      // "winner" => "",
-      "stats" => []
-    );
-    foreach ($playerUUIDs as $i => $player) {
-      $n = $this->newSingleStats($player);
-      $stats["stats"][] = $n;
-    }
-    return $stats;
-  }
+  // private function newSingleStats($player)
+  // {
+  //   return array(
+  //     "player" => $player,
+  //     "average" => [0, 0],
+  //     "first9" => [0, 0],
+  //     "checkouts" => [0, 0],
+  //     "checkoutPoints" => [],
+  //     "checkins" => [0, 0],
+  //     "checkinPoints" => [],
+  //     "60+" => 0,
+  //     "100+" => 0,
+  //     "140+" => 0,
+  //     "180" => 0
+  //   );
+  // }
+  // private function newStats(){
+  //   $playerUUIDs = $this->playerUUIDs();
+  //   $stats = array(
+  //     // "winner" => "",
+  //     "stats" => []
+  //   );
+  //   foreach ($playerUUIDs as $i => $player) {
+  //     $n = $this->newSingleStats($player);
+  //     $stats["stats"][] = $n;
+  //   }
+  //   return $stats;
+  // }
   //
   // private function addNewSet(&$game, $points){
   //   $playerUUIDs = $this->playerUUIDs();
@@ -335,15 +346,15 @@ class XoiPage extends Page {
   //   return $game;
   // }
   //
-  private function addNewSetStats(&$stats){
-    $stats["sets"][] = $this->newStats();
-    $stats["sets"][0]["legs"] = [];
-    return $stats;
-  }
-  private function addNewLegStats(&$stats){
-    last($stats["sets"])["legs"][] = $this->newStats();
-    return $stats;
-  }
+  // private function addNewSetStats(&$stats){
+  //   $stats["sets"][] = $this->newStats();
+  //   $stats["sets"][0]["legs"] = [];
+  //   return $stats;
+  // }
+  // private function addNewLegStats(&$stats){
+  //   last($stats["sets"])["legs"][] = $this->newStats();
+  //   return $stats;
+  // }
   //
   // public function recalcStats(){
   //   $game = $this->rounds()->parseJSON();
@@ -370,38 +381,38 @@ class XoiPage extends Page {
   //   return $this->storeStats($stats);
   // }
   //
-  private function initStats()
-  {
-    $stats = $this->newStats();
-    $stats["sets"] = [];
-    $this->addNewSetStats($stats);
-    $this->addNewLegStats($stats);
-    return $this->storeStats($stats);
-  }
+  // private function initStats()
+  // {
+  //   $stats = $this->newStats();
+  //   $stats["sets"] = [];
+  //   $this->addNewSetStats($stats);
+  //   $this->addNewLegStats($stats);
+  //   return $this->storeStats($stats);
+  // }
 
-  public function initGame($startTime = true) {
-    $playerUUIDs = $this->playerUUIDs();
-    $game = array('sets' => [array(
-          'points' => array_fill(0, count($playerUUIDs), 0),
-          'legs' => [
-            array(
-              'points' => array_fill(0, count($playerUUIDs), 0),
-              'visits' => [$this->newVisit($playerUUIDs[0], 1)]
-            )
-          ]
-        )
-    ]);
+  // public function initGame($startTime = true) {
+  //   $playerUUIDs = $this->playerUUIDs();
+  //   $game = array('sets' => [array(
+  //         'points' => array_fill(0, count($playerUUIDs), 0),
+  //         'legs' => [
+  //           array(
+  //             'points' => array_fill(0, count($playerUUIDs), 0),
+  //             'visits' => [$this->newVisit($playerUUIDs[0], 1)]
+  //           )
+  //         ]
+  //       )
+  //   ]);
 
-    $page = $this->initStats();
-    $update = [
-      'rounds' => json_encode($game)
-    ];
-    if ($startTime) {
-      $update['startdate'] = date("Y-m-d H:i:s");
-    }
-    kirby()->impersonate('kirby');
-    return $page->update($update);
-  }
+  //   $page = $this->initStats();
+  //   $update = [
+  //     'rounds' => json_encode($game)
+  //   ];
+  //   if ($startTime) {
+  //     $update['startdate'] = date("Y-m-d H:i:s");
+  //   }
+  //   kirby()->impersonate('kirby');
+  //   return $page->update($update);
+  // }
   //
   // public function storeStats($stats)
   // {
diff --git a/site/snippets/tournament.php b/site/snippets/tournament.php
new file mode 100644
index 0000000..53e36b8
--- /dev/null
+++ b/site/snippets/tournament.php
@@ -0,0 +1,3 @@
+<h1>
+<?= var_dump($page->getStats("page://90CUYLfokdOm9Gw0")) ?>
+</h1>
\ No newline at end of file
diff --git a/site/templates/default.php b/site/templates/default.php
index 4cb627d..e69de29 100644
--- a/site/templates/default.php
+++ b/site/templates/default.php
@@ -1,24 +0,0 @@
-<?php snippet("header", ['title' => "???"]) ?>
-
-<h1><?= $page->title() ?></h1>
-<!-- <h2><?= $page->uuid() ?></h2> -->
-
-<?=
-
-var_dump($page->getStats($page->children()->first()->players()->toPages()->first()->uuid()->toString()));
-
-?>
-<?php
-//
-// foreach ($page->children() as $page) {
-//     echo json_decode($page->stats()->toString())->stats[0]->average[0];
-//     echo "/";
-//     echo json_decode($page->stats()->toString())->stats[0]->average[1];
-//     echo "<br>";
-//     echo json_decode($page->stats()->toString())->stats[1]->average[0];
-//     echo "/";
-//     echo json_decode($page->stats()->toString())->stats[1]->average[1];
-//     echo "<br>";
-// };
-
-?>
diff --git a/site/templates/member.php b/site/templates/member.php
new file mode 100644
index 0000000..47c23a4
--- /dev/null
+++ b/site/templates/member.php
@@ -0,0 +1,6 @@
+<h1>
+<?php 
+echo $page->forename();
+?>
+</h1>
+
diff --git a/site/templates/tnmbrackets.php b/site/templates/tnmbrackets.php
new file mode 100644
index 0000000..9a4162a
--- /dev/null
+++ b/site/templates/tnmbrackets.php
@@ -0,0 +1 @@
+<?php snippet("tournament") ?>
\ No newline at end of file
diff --git a/site/templates/tnmfreeforall.php b/site/templates/tnmfreeforall.php
new file mode 100644
index 0000000..9a4162a
--- /dev/null
+++ b/site/templates/tnmfreeforall.php
@@ -0,0 +1 @@
+<?php snippet("tournament") ?>
\ No newline at end of file
diff --git a/site/templates/tnmteambrackets.php b/site/templates/tnmteambrackets.php
new file mode 100644
index 0000000..9a4162a
--- /dev/null
+++ b/site/templates/tnmteambrackets.php
@@ -0,0 +1 @@
+<?php snippet("tournament") ?>
\ No newline at end of file