diff --git a/config.json b/config.json
index 352ee4c6..0da1bc35 100644
--- a/config.json
+++ b/config.json
@@ -363,6 +363,14 @@
           "strings"
         ]
       },
+      {
+        "slug": "yacht",
+        "name": "Yacht",
+        "uuid": "8672aea2-6862-441d-9e28-198987932a2d",
+        "practices": [],
+        "prerequisites": [],
+        "difficulty": 2
+      },
       {
         "slug": "all-your-base",
         "name": "All Your Base",
diff --git a/exercises/practice/yacht/.docs/instructions.md b/exercises/practice/yacht/.docs/instructions.md
new file mode 100644
index 00000000..519b7a68
--- /dev/null
+++ b/exercises/practice/yacht/.docs/instructions.md
@@ -0,0 +1,30 @@
+# Instructions
+
+Given five dice and a category, calculate the score of the dice for that category.
+
+~~~~exercism/note
+You'll always be presented with five dice.
+Each dice's value will be between one and six inclusively.
+The dice may be unordered.
+~~~~
+
+## Scores in Yacht
+
+| Category        | Score                  | Description                              | Example             |
+| --------------- | ---------------------- | ---------------------------------------- | ------------------- |
+| Ones            | 1 × number of ones     | Any combination                          | 1 1 1 4 5 scores 3  |
+| Twos            | 2 × number of twos     | Any combination                          | 2 2 3 4 5 scores 4  |
+| Threes          | 3 × number of threes   | Any combination                          | 3 3 3 3 3 scores 15 |
+| Fours           | 4 × number of fours    | Any combination                          | 1 2 3 3 5 scores 0  |
+| Fives           | 5 × number of fives    | Any combination                          | 5 1 5 2 5 scores 15 |
+| Sixes           | 6 × number of sixes    | Any combination                          | 2 3 4 5 6 scores 6  |
+| Full House      | Total of the dice      | Three of one number and two of another   | 3 3 3 5 5 scores 19 |
+| Four of a Kind  | Total of the four dice | At least four dice showing the same face | 4 4 4 4 6 scores 16 |
+| Little Straight | 30 points              | 1-2-3-4-5                                | 1 2 3 4 5 scores 30 |
+| Big Straight    | 30 points              | 2-3-4-5-6                                | 2 3 4 5 6 scores 30 |
+| Choice          | Sum of the dice        | Any combination                          | 2 3 3 4 6 scores 18 |
+| Yacht           | 50 points              | All five dice showing the same face      | 4 4 4 4 4 scores 50 |
+
+If the dice do **not** satisfy the requirements of a category, the score is zero.
+If, for example, _Four Of A Kind_ is entered in the _Yacht_ category, zero points are scored.
+A _Yacht_ scores zero if entered in the _Full House_ category.
diff --git a/exercises/practice/yacht/.docs/introduction.md b/exercises/practice/yacht/.docs/introduction.md
new file mode 100644
index 00000000..5b541f56
--- /dev/null
+++ b/exercises/practice/yacht/.docs/introduction.md
@@ -0,0 +1,11 @@
+# Introduction
+
+Each year, something new is "all the rage" in your high school.
+This year it is a dice game: [Yacht][yacht].
+
+The game of Yacht is from the same family as Poker Dice, Generala and particularly Yahtzee, of which it is a precursor.
+The game consists of twelve rounds.
+In each, five dice are rolled and the player chooses one of twelve categories.
+The chosen category is then used to score the throw of the dice.
+
+[yacht]: https://en.wikipedia.org/wiki/Yacht_(dice_game)
diff --git a/exercises/practice/yacht/.meta/config.json b/exercises/practice/yacht/.meta/config.json
new file mode 100644
index 00000000..e09eb473
--- /dev/null
+++ b/exercises/practice/yacht/.meta/config.json
@@ -0,0 +1,19 @@
+{
+  "authors": [
+    "BNAndras"
+  ],
+  "files": {
+    "solution": [
+      "src/main/groovy/Yacht.groovy"
+    ],
+    "test": [
+      "src/test/groovy/YachtSpec.groovy"
+    ],
+    "example": [
+      ".meta/src/reference/groovy/Yacht.groovy"
+    ]
+  },
+  "blurb": "Score a single throw of dice in the game Yacht.",
+  "source": "James Kilfiger, using wikipedia",
+  "source_url": "https://en.wikipedia.org/wiki/Yacht_(dice_game)"
+}
diff --git a/exercises/practice/yacht/.meta/src/reference/groovy/Yacht.groovy b/exercises/practice/yacht/.meta/src/reference/groovy/Yacht.groovy
new file mode 100644
index 00000000..3f3cbc63
--- /dev/null
+++ b/exercises/practice/yacht/.meta/src/reference/groovy/Yacht.groovy
@@ -0,0 +1,45 @@
+class Yacht {
+
+    static Integer score(List<Integer> dice, String category) {
+
+        if (category == "yacht") {
+            return dice.unique().size() == 1 ? 50 : 0
+        }
+        if (category == "ones") {
+            return dice.findAll { it == 1 }.sum() ?: 0
+        }
+        if (category == "twos") {
+            return dice.findAll { it == 2 }.sum() ?: 0
+        }
+        if (category == "threes") {
+            return dice.findAll { it == 3 }.sum() ?: 0
+        }
+        if (category == "fours") {
+            return dice.findAll { it == 4 }.sum() ?: 0
+        }
+        if (category == "fives") {
+            return dice.findAll { it == 5 }.sum() ?: 0
+        }
+        if (category == "sixes") {
+            return dice.findAll { it == 6 }.sum() ?: 0
+        }
+        if (category == "full house") {
+            def counts = dice.countBy { it }
+            return counts.containsValue(3) && counts.containsValue(2) ? dice.sum() : 0
+        }
+        if (category == "four of a kind") {
+            def counts = dice.countBy { it }
+            return (counts.find { it.value >= 4 }?.key ?: 0) * 4
+        }
+        if (category == "little straight") {
+            return dice.sort() == [1, 2, 3, 4, 5] ? 30 : 0
+        }
+        if (category == "big straight") {
+            return dice.sort() == [2, 3, 4, 5, 6] ? 30 : 0
+        }
+        if (category == "choice") {
+            return dice.sum()
+        }
+    }
+}
+
diff --git a/exercises/practice/yacht/.meta/tests.toml b/exercises/practice/yacht/.meta/tests.toml
new file mode 100644
index 00000000..b9d92037
--- /dev/null
+++ b/exercises/practice/yacht/.meta/tests.toml
@@ -0,0 +1,97 @@
+# This is an auto-generated file.
+#
+# Regenerating this file via `configlet sync` will:
+# - Recreate every `description` key/value pair
+# - Recreate every `reimplements` key/value pair, where they exist in problem-specifications
+# - Remove any `include = true` key/value pair (an omitted `include` key implies inclusion)
+# - Preserve any other key/value pair
+#
+# As user-added comments (using the # character) will be removed when this file
+# is regenerated, comments can be added via a `comment` key.
+
+[3060e4a5-4063-4deb-a380-a630b43a84b6]
+description = "Yacht"
+
+[15026df2-f567-482f-b4d5-5297d57769d9]
+description = "Not Yacht"
+
+[36b6af0c-ca06-4666-97de-5d31213957a4]
+description = "Ones"
+
+[023a07c8-6c6e-44d0-bc17-efc5e1b8205a]
+description = "Ones, out of order"
+
+[7189afac-cccd-4a74-8182-1cb1f374e496]
+description = "No ones"
+
+[793c4292-dd14-49c4-9707-6d9c56cee725]
+description = "Twos"
+
+[dc41bceb-d0c5-4634-a734-c01b4233a0c6]
+description = "Fours"
+
+[f6125417-5c8a-4bca-bc5b-b4b76d0d28c8]
+description = "Yacht counted as threes"
+
+[464fc809-96ed-46e4-acb8-d44e302e9726]
+description = "Yacht of 3s counted as fives"
+
+[d054227f-3a71-4565-a684-5c7e621ec1e9]
+description = "Fives"
+
+[e8a036e0-9d21-443a-8b5f-e15a9e19a761]
+description = "Sixes"
+
+[51cb26db-6b24-49af-a9ff-12f53b252eea]
+description = "Full house two small, three big"
+
+[1822ca9d-f235-4447-b430-2e8cfc448f0c]
+description = "Full house three small, two big"
+
+[b208a3fc-db2e-4363-a936-9e9a71e69c07]
+description = "Two pair is not a full house"
+
+[b90209c3-5956-445b-8a0b-0ac8b906b1c2]
+description = "Four of a kind is not a full house"
+
+[32a3f4ee-9142-4edf-ba70-6c0f96eb4b0c]
+description = "Yacht is not a full house"
+
+[b286084d-0568-4460-844a-ba79d71d79c6]
+description = "Four of a Kind"
+
+[f25c0c90-5397-4732-9779-b1e9b5f612ca]
+description = "Yacht can be scored as Four of a Kind"
+
+[9f8ef4f0-72bb-401a-a871-cbad39c9cb08]
+description = "Full house is not Four of a Kind"
+
+[b4743c82-1eb8-4a65-98f7-33ad126905cd]
+description = "Little Straight"
+
+[7ac08422-41bf-459c-8187-a38a12d080bc]
+description = "Little Straight as Big Straight"
+
+[97bde8f7-9058-43ea-9de7-0bc3ed6d3002]
+description = "Four in order but not a little straight"
+
+[cef35ff9-9c5e-4fd2-ae95-6e4af5e95a99]
+description = "No pairs but not a little straight"
+
+[fd785ad2-c060-4e45-81c6-ea2bbb781b9d]
+description = "Minimum is 1, maximum is 5, but not a little straight"
+
+[35bd74a6-5cf6-431a-97a3-4f713663f467]
+description = "Big Straight"
+
+[87c67e1e-3e87-4f3a-a9b1-62927822b250]
+description = "Big Straight as little straight"
+
+[c1fa0a3a-40ba-4153-a42d-32bc34d2521e]
+description = "No pairs but not a big straight"
+
+[207e7300-5d10-43e5-afdd-213e3ac8827d]
+description = "Choice"
+
+[b524c0cf-32d2-4b40-8fb3-be3500f3f135]
+description = "Yacht as choice"
diff --git a/exercises/practice/yacht/build.gradle b/exercises/practice/yacht/build.gradle
new file mode 100644
index 00000000..e16cd99d
--- /dev/null
+++ b/exercises/practice/yacht/build.gradle
@@ -0,0 +1,18 @@
+apply plugin: "groovy"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation "org.spockframework:spock-core:2.0-M2-groovy-3.0"
+    implementation "org.codehaus.groovy:groovy-all:3.0.2"
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        exceptionFormat = 'full'
+        events = ["passed", "failed", "skipped"]
+    }
+}
\ No newline at end of file
diff --git a/exercises/practice/yacht/gradle/wrapper/gradle-wrapper.jar b/exercises/practice/yacht/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..f3d88b1c
Binary files /dev/null and b/exercises/practice/yacht/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/exercises/practice/yacht/gradle/wrapper/gradle-wrapper.properties b/exercises/practice/yacht/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..b7c8c5db
--- /dev/null
+++ b/exercises/practice/yacht/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/exercises/practice/yacht/gradlew b/exercises/practice/yacht/gradlew
new file mode 100644
index 00000000..2fe81a7d
--- /dev/null
+++ b/exercises/practice/yacht/gradlew
@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/exercises/practice/yacht/gradlew.bat b/exercises/practice/yacht/gradlew.bat
new file mode 100644
index 00000000..62bd9b9c
--- /dev/null
+++ b/exercises/practice/yacht/gradlew.bat
@@ -0,0 +1,103 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/exercises/practice/yacht/src/main/groovy/Yacht.groovy b/exercises/practice/yacht/src/main/groovy/Yacht.groovy
new file mode 100644
index 00000000..b4aac46e
--- /dev/null
+++ b/exercises/practice/yacht/src/main/groovy/Yacht.groovy
@@ -0,0 +1,7 @@
+class Yacht {
+
+    static Integer score(List<Integer> dice, String category) {
+        throw new UnsupportedOperationException('method not implemented.')
+    }
+}
+
diff --git a/exercises/practice/yacht/src/test/groovy/YachtSpec.groovy b/exercises/practice/yacht/src/test/groovy/YachtSpec.groovy
new file mode 100644
index 00000000..0c3332da
--- /dev/null
+++ b/exercises/practice/yacht/src/test/groovy/YachtSpec.groovy
@@ -0,0 +1,43 @@
+import spock.lang.*
+
+class YachtSpec extends Specification {
+
+    @Unroll
+    def "#label"() {
+        expect:
+        Yacht.score(dice, category) == expected
+
+        where:
+        label                                                   | dice              | category          || expected
+        'Yacht'                                                 | [5, 5, 5, 5, 5]   | "yacht"           || 50
+        'Not Yacht'                                             | [1, 3, 3, 2, 5]   | "yacht"           || 0
+        'Ones'                                                  | [1, 1, 1, 3, 5]   | "ones"            || 3
+        'Ones, out of order'                                    | [3, 1, 1, 5, 1]   | "ones"            || 3
+        'No ones'                                               | [4, 3, 6, 5, 5]   | "ones"            || 0
+        'Twos'                                                  | [2, 3, 4, 5, 6]   | "twos"            || 2
+        'Fours'                                                 | [1, 4, 1, 4, 1]   | "fours"           || 8
+        'Yacht counted as threes'                               | [3, 3, 3, 3, 3]   | "threes"          || 15
+        'Yacht of 3s counted as fives'                          | [3, 3, 3, 3, 3]   | "fives"           || 0
+        'Fives'                                                 | [1, 5, 3, 5, 3]   | "fives"           || 10
+        'Sixes'                                                 | [2, 3, 4, 5, 6]   | "sixes"           || 6
+        'Full house two small, three big'                       | [2, 2, 4, 4, 4]   | "full house"      || 16
+        'Full house three small, two big'                       | [5, 3, 3, 5, 3]   | "full house"      || 19
+        'Two pair is not a full house'                          | [2, 2, 4, 4, 5]   | "full house"      || 0
+        'Four of a kind is not a full house'                    | [1, 4, 4, 4, 4]   | "full house"      || 0
+        'Yacht is not a full house'                             | [2, 2, 2, 2, 2]   | "full house"      || 0
+        'Four of a Kind'                                        | [6, 6, 4, 6, 6]   | "four of a kind"  || 24
+        'Yacht can be scored as Four of a Kind'                 | [3, 3, 3, 3, 3]   | "four of a kind"  || 12
+        'Full house is not Four of a Kind'                      | [3, 3, 3, 5, 5]   | "four of a kind"  || 0
+        'Little Straight'                                       | [3, 5, 4, 1, 2]   | "little straight" || 30
+        'Little Straight as Big Straight'                       | [1, 2, 3, 4, 5]   | "big straight"    || 0
+        'Four in order but not a little straight'               | [1, 1, 2, 3, 4]   | "little straight" || 0
+        'No pairs but not a little straight'                    | [1, 2, 3, 4, 6]   | "little straight" || 0
+        'Minimum is 1, maximum is 5, but not a little straight' | [1, 1, 3, 4, 5]   | "little straight" || 0
+        'Big Straight'                                          | [4, 6, 2, 5, 3]   | "big straight"    || 30
+        'Big Straight as little straight'                       | [6, 5, 4, 3, 2]   | "little straight" || 0
+        'No pairs but not a big straight'                       | [6, 5, 4, 3, 1]   | "big straight"    || 0
+        'Choice'                                                | [3, 3, 5, 6, 6]   | "choice"          || 23
+        'Yacht as choice'                                       | [2, 2, 2, 2, 2]   | "choice"          || 10
+    }
+}
+
diff --git a/settings.gradle b/settings.gradle
index d946a50b..56db62fc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -61,3 +61,4 @@ include 'exercises:practice:square-root'
 include 'exercises:practice:triangle'
 include 'exercises:practice:two-fer'
 include 'exercises:practice:word-count'
+include 'exercises:practice:yacht'