diff --git a/Model/Config/Source/Available/Good4fun.php b/Model/Config/Source/Available/Good4fun.php
new file mode 100644
index 00000000..26d79455
--- /dev/null
+++ b/Model/Config/Source/Available/Good4fun.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © 2020 PAY. All rights reserved.
+ */
+
+namespace Paynl\Payment\Model\Config\Source\Available;
+
+
+class Good4fun extends Available
+{
+    protected $_class = \Paynl\Payment\Model\Paymentmethod\Good4fun::class;
+}
\ No newline at end of file
diff --git a/Model/ConfigProvider.php b/Model/ConfigProvider.php
index 29c818c5..35ed37fb 100644
--- a/Model/ConfigProvider.php
+++ b/Model/ConfigProvider.php
@@ -38,6 +38,7 @@ class ConfigProvider implements ConfigProviderInterface
         'paynl_payment_gezondheidsbon',
         'paynl_payment_giropay',
         'paynl_payment_givacard',
+        'paynl_payment_good4fun',
         'paynl_payment_huisentuincadeau',
         'paynl_payment_ideal',
         'paynl_payment_instore',
diff --git a/Model/Paymentmethod/Good4fun.php b/Model/Paymentmethod/Good4fun.php
new file mode 100644
index 00000000..536924c7
--- /dev/null
+++ b/Model/Paymentmethod/Good4fun.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © 2020 PAY. All rights reserved.
+ */
+
+namespace Paynl\Payment\Model\Paymentmethod;
+
+/**
+ * Class Good4fun
+ * @package Paynl\Payment\Model\Paymentmethod
+ */
+class Good4fun extends PaymentMethod
+{
+    protected $_code = 'paynl_payment_good4fun';
+
+    protected function getDefaultPaymentOptionId()
+    {
+        return 2628;
+    }
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 151a84af..f1723dfb 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,8 @@ Maestro | Dankort | Fashion Giftcard | Klarna | Instore Payments (POS) |
 Bank Transfer | Cartasi | GivaCard | SprayPay | Przelewy24 | 
 | Tikkie | De Cadeaukaart | YourGift | Creditclick | Apple Pay | 
 | Multibanco | | Paysafecard | | Payconiq
-| | | Huis en Tuin Cadeau 
+| | | Huis en Tuin Cadeau
+| | | Good4Fun
 
 # Requirements
 
diff --git a/etc/adminhtml/paymentmethods.xml b/etc/adminhtml/paymentmethods.xml
index 2a283f10..8058914d 100644
--- a/etc/adminhtml/paymentmethods.xml
+++ b/etc/adminhtml/paymentmethods.xml
@@ -27,6 +27,7 @@
     <include path="Paynl_Payment::paymentmethods/gezondheidsbon.xml" />
     <include path="Paynl_Payment::paymentmethods/giropay.xml" />
     <include path="Paynl_Payment::paymentmethods/givacard.xml" />
+    <include path="Paynl_Payment::paymentmethods/good4fun.xml" />
     <include path="Paynl_Payment::paymentmethods/huisentuincadeau.xml" />
     <include path="Paynl_Payment::paymentmethods/ideal.xml" />
     <include path="Paynl_Payment::paymentmethods/instore.xml" />
diff --git a/etc/adminhtml/paymentmethods/good4fun.xml b/etc/adminhtml/paymentmethods/good4fun.xml
new file mode 100644
index 00000000..66718097
--- /dev/null
+++ b/etc/adminhtml/paymentmethods/good4fun.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="paynl_payment_good4fun" sortOrder="925" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Good4Fun</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Enabled</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Available\Good4fun</source_model>
+            <config_path>payment/paynl_payment_good4fun/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Title</label>
+            <config_path>payment/paynl_payment_good4fun/title</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>New Order Status</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_good4fun/order_status</config_path>
+        </field>
+        <field id="order_status_authorized" translate="label" type="select" sortOrder="32" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Authorized Order Status</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Order\Status\Processing</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_good4fun/order_status_authorized</config_path>
+        </field>
+        <field id="order_status_processing" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Paid Order Status</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Order\Status\Processing</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_good4fun/order_status_processing</config_path>
+        </field>
+        <field id="holded" translate="label" type="select" sortOrder="35" showInDefault="1"
+               showInWebsite="1"
+               showInStore="1">
+            <label>Set order on-hold</label>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <config_path>payment/paynl_payment_good4fun/holded</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <comment><![CDATA[Set the orderstatus to on-hold when payment begins (to hold stock).]]></comment>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="40" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Applicable Countries</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/paynl_payment_good4fun/allowspecific</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="50" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Payment from Specific Countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <can_be_empty>1</can_be_empty>
+            <config_path>payment/paynl_payment_good4fun/specificcountry</config_path>
+            <depends>
+                <field id="allowspecific">1</field>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="instructions" translate="label" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Instructions</label>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_good4fun/instructions</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Minimum Order Total</label>
+            <config_path>payment/paynl_payment_good4fun/min_order_total</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Maximum Order Total</label>
+            <config_path>payment/paynl_payment_good4fun/max_order_total</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Sort Order</label>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/paynl_payment_good4fun/sort_order</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="send_new_order_email" translate="label" type="select" sortOrder="100" showInDefault="1"
+               showInWebsite="1"
+               showInStore="1">
+            <label>Send new order email</label>
+            <source_model>Paynl\Payment\Model\Config\Source\SendNewOrderEmail</source_model>
+            <config_path>payment/paynl_payment_good4fun/send_new_order_email</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="disallowedshipping" translate="label" type="multiselect" sortOrder="110" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Disallowed Shipping Methods</label>
+            <source_model>Magento\Shipping\Model\Config\Source\Allmethods</source_model>
+            <can_be_empty>1</can_be_empty>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_good4fun/disallowedshipping</config_path>
+            <comment><![CDATA[Hold CTRL button to select/deselect multiple]]></comment>
+        </field>
+        <field id="showforcompany" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Show for companies</label>
+            <source_model>Paynl\Payment\Model\Config\Source\showCompanyOptions</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_good4fun/showforcompany</config_path>
+            <comment><![CDATA[Allow payment method to be used for companies, private, or both.]]></comment>
+        </field>
+        <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Advanced</label>
+            <field id="payment_option_id" translate="label comment" type="text" sortOrder="10" showInDefault="1"
+                   showInWebsite="1"
+                   showInStore="1">
+                <label>Payment option id</label>
+                <comment>The id of the payment method, only change this if you are told to do so</comment>
+                <config_path>payment/paynl_payment_good4fun/payment_option_id</config_path>
+            </field>
+        </group>
+    </group>
+</include>
+
diff --git a/etc/config.xml b/etc/config.xml
index 6a9be53a..9abd31e1 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -288,6 +288,18 @@ In order to pay for your order click the link below
                 <group>paynl_payment</group>
                 <send_new_order_email>after_payment</send_new_order_email>
             </paynl_payment_givacard>
+            <paynl_payment_good4fun>
+                <active>0</active>
+                <title>Good4Fun</title>
+                <payment_option_id>2628</payment_option_id>
+                <order_status>pending_payment</order_status>
+                <order_status_authorized>processing</order_status_authorized>
+                <order_status_processing>processing</order_status_processing>
+                <payment_action>order</payment_action>
+                <model>Paynl\Payment\Model\Paymentmethod\Good4fun</model>
+                <group>paynl_payment</group>
+                <send_new_order_email>after_payment</send_new_order_email>
+            </paynl_payment_good4fun>
             <paynl_payment_huisentuincadeau>
                 <active>0</active>
                 <title>Huis en Tuin Cadeau</title>
diff --git a/etc/payment.xml b/etc/payment.xml
index 18491fc8..c4529dd3 100644
--- a/etc/payment.xml
+++ b/etc/payment.xml
@@ -63,6 +63,9 @@
         <method name="paynl_payment_gezondheidsbon">
             <allow_multiple_address>0</allow_multiple_address>
         </method>
+        <method name="paynl_payment_good4fun">
+            <allow_multiple_address>0</allow_multiple_address>
+        </method>
         <method name="paynl_payment_giropay">
             <allow_multiple_address>0</allow_multiple_address>
         </method>
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index 511f9174..6b37ceae 100644
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -83,6 +83,9 @@
                                                                         <item name="paynl_payment_givacard" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="paynl_payment_good4fun" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
                                                                         <item name="paynl_payment_huisentuincadeau" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
diff --git a/view/frontend/web/js/view/payment/method-renderer.js b/view/frontend/web/js/view/payment/method-renderer.js
index 5625764e..1d3b547b 100644
--- a/view/frontend/web/js/view/payment/method-renderer.js
+++ b/view/frontend/web/js/view/payment/method-renderer.js
@@ -32,6 +32,7 @@ define(
             {type: 'paynl_payment_gezondheidsbon', component: defaultComponent},
             {type: 'paynl_payment_giropay', component: defaultComponent},
             {type: 'paynl_payment_givacard', component: defaultComponent},
+            {type: 'paynl_payment_good4fun', component: defaultComponent},
             {type: 'paynl_payment_huisentuincadeau', component: defaultComponent},
             {type: 'paynl_payment_ideal', component: defaultComponent},
             {type: 'paynl_payment_instore', component: defaultComponent},