diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php
index 1db8508bdb66..8cd1eb48cf38 100644
--- a/app/PaymentDrivers/CheckoutComPaymentDriver.php
+++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php
@@ -273,4 +273,16 @@ class CheckoutComPaymentDriver extends BasePaymentDriver
             $company_gateway_token->save();
         }
     }
+
+    public function refund(Payment $payment, $amount)
+    {
+        $payment = new \Checkout\Models\Payments\Refund($payment->transaction_reference);
+        $payment->amount = $amount;
+
+        try {
+            $refund = $this->gateway->payments()->refund($payment);
+        } catch (CheckoutHttpException $e) {
+            // ..
+        }
+    }
 }
diff --git a/app/PaymentDrivers/PayPalExpressPaymentDriver.php b/app/PaymentDrivers/PayPalExpressPaymentDriver.php
index 6cea7b0a6df5..e2b8b01f02c2 100644
--- a/app/PaymentDrivers/PayPalExpressPaymentDriver.php
+++ b/app/PaymentDrivers/PayPalExpressPaymentDriver.php
@@ -69,6 +69,10 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver
 
     protected $customer_reference = '';
 
+    public function setPaymentMethod($payment_method_id = null)
+    {
+        return $this;
+    }
 
     public function gatewayTypes()
     {
@@ -283,32 +287,29 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver
             ->send();
 
         if ($response->isSuccessful()) {
-            SystemLogger::dispatch(
-                [
-                    'server_response' => $response->getMessage(),
-                    'data' => request()->all(),
-                ],
-                SystemLog::CATEGORY_GATEWAY_RESPONSE,
-                SystemLog::EVENT_GATEWAY_SUCCESS,
-                SystemLog::TYPE_PAYPAL,
-                $this->client
-            );
+            SystemLogger::dispatch([
+                'server_response' => $response->getMessage(), 'data' => request()->all(),
+            ], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_PAYPAL, $this->client);
 
-            return true;
+            return [
+                'transaction_reference' => $response->getData()['REFUNDTRANSACTIONID'],
+                'transaction_response' => json_encode($response->getData()),
+                'success' => true,
+                'description' => $response->getData()['ACK'],
+                'code' => $response->getCode(),
+            ];
         }
 
-        SystemLogger::dispatch(
-            [
-                'server_response' => $response->getMessage(),
-                'data' => request()->all(),
-            ],
-            SystemLog::CATEGORY_GATEWAY_RESPONSE,
-            SystemLog::EVENT_GATEWAY_FAILURE,
-            SystemLog::TYPE_PAYPAL,
-            $this->client
-        );
+        SystemLogger::dispatch([
+            'server_response' => $response->getMessage(), 'data' => request()->all(),
+        ], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_PAYPAL, $this->client);
 
-
-        return false;
+        return [
+            'transaction_reference' => $response->getData()['CORRELATIONID'],
+            'transaction_response' => json_encode($response->getData()),
+            'success' => false,
+            'description' => $response->getData()['L_LONGMESSAGE0'],
+            'code' => $response->getData()['L_ERRORCODE0'],
+        ];
     }
 }
diff --git a/app/PaymentDrivers/Stripe/Alipay.php b/app/PaymentDrivers/Stripe/Alipay.php
index 452221ed483a..9ed61a4cd291 100644
--- a/app/PaymentDrivers/Stripe/Alipay.php
+++ b/app/PaymentDrivers/Stripe/Alipay.php
@@ -49,6 +49,7 @@ class Alipay
             'hashed_ids' => implode(",", $data['hashed_ids']),
             'amount' => $data['amount'],
             'fee' => $data['fee'],
+            'payment_method_id' => GatewayType::SOFORT,
         ]);
     }
 
diff --git a/app/PaymentDrivers/Stripe/CreditCard.php b/app/PaymentDrivers/Stripe/CreditCard.php
index 5f1fa81c90e7..670cc6c963a3 100644
--- a/app/PaymentDrivers/Stripe/CreditCard.php
+++ b/app/PaymentDrivers/Stripe/CreditCard.php
@@ -162,7 +162,7 @@ class CreditCard
 
         $payment_type = PaymentType::parseCardType($payment_method_object['card']['brand']);
 
-        if ($state['save_card'] === true) {
+        if ($state['save_card'] == true) {
             $this->saveCard($state);
         }
 
@@ -216,7 +216,7 @@ class CreditCard
         $company_gateway_token = new ClientGatewayToken();
         $company_gateway_token->company_id = $this->stripe->client->company->id;
         $company_gateway_token->client_id = $this->stripe->client->id;
-        $company_gateway_token->token = $state['payment_method'];
+        $company_gateway_token->token = $state['payment_method']->id;
         $company_gateway_token->company_gateway_id = $this->stripe->company_gateway->id;
         $company_gateway_token->gateway_type_id = $state['gateway_type_id'];
         $company_gateway_token->gateway_customer_reference = $state['customer'];
diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php
index e71080fd7c21..cff4ceda3e34 100644
--- a/app/PaymentDrivers/StripePaymentDriver.php
+++ b/app/PaymentDrivers/StripePaymentDriver.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Invoice Ninja (https://invoiceninja.com)
  *
@@ -21,6 +22,10 @@ use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
+use App\PaymentDrivers\Stripe\ACH;
+use App\PaymentDrivers\Stripe\Alipay;
+use App\PaymentDrivers\Stripe\CreditCard;
+use App\PaymentDrivers\Stripe\SOFORT;
 use App\PaymentDrivers\Stripe\Utilities;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
@@ -43,6 +48,15 @@ class StripePaymentDriver extends BasePaymentDriver
 
     protected $payment_method;
 
+    public static $methods = [
+        GatewayType::CREDIT_CARD => CreditCard::class,
+        GatewayType::BANK_TRANSFER => ACH::class,
+        GatewayType::ALIPAY => Alipay::class,
+        GatewayType::SOFORT => SOFORT::class,
+        GatewayType::APPLE_PAY => 1,
+        GatewayType::SEPA => 1,
+    ];
+
     /**
      * Methods in this class are divided into
      * two separate streams
@@ -60,16 +74,16 @@ class StripePaymentDriver extends BasePaymentDriver
      * Initializes the Stripe API
      * @return void
      */
-    public function init() :void
+    public function init(): void
     {
         Stripe::setApiKey($this->company_gateway->getConfigField('apiKey'));
     }
 
-    public function setPaymentMethod(string $method)
+    public function setPaymentMethod($payment_method_id)
     {
-        // Example: setPaymentMethod('App\\PaymentDrivers\\Stripe\\CreditCard');
+        $class = self::$methods[$payment_method_id];
 
-        $this->payment_method = new $method($this);
+        $this->payment_method = new $class($this);
 
         return $this;
     }
@@ -77,7 +91,7 @@ class StripePaymentDriver extends BasePaymentDriver
     /**
      * Returns the gateway types
      */
-    public function gatewayTypes() :array
+    public function gatewayTypes(): array
     {
         $types = [
             GatewayType::CREDIT_CARD,
@@ -202,13 +216,13 @@ class StripePaymentDriver extends BasePaymentDriver
       +"shipping": null
       +"source": null
       +"status": "succeeded"
-    */
+     */
     public function processPaymentResponse($request) //We never have to worry about unsuccessful payments as failures are handled at the front end for this driver.
     {
         return $this->payment_method->paymentResponse($request);
     }
 
-    public function createPayment($data, $status = Payment::STATUS_COMPLETED) :Payment
+    public function createPayment($data, $status = Payment::STATUS_COMPLETED): Payment
     {
         $payment = parent::createPayment($data, $status);
 
@@ -230,7 +244,7 @@ class StripePaymentDriver extends BasePaymentDriver
      * @param  array $data The data array to be passed to Stripe
      * @return PaymentIntent       The Stripe payment intent object
      */
-    public function createPaymentIntent($data) :?\Stripe\PaymentIntent
+    public function createPaymentIntent($data): ?\Stripe\PaymentIntent
     {
         $this->init();
 
@@ -243,7 +257,7 @@ class StripePaymentDriver extends BasePaymentDriver
      *
      * @return \Stripe\SetupIntent
      */
-    public function getSetupIntent() :\Stripe\SetupIntent
+    public function getSetupIntent(): \Stripe\SetupIntent
     {
         $this->init();
 
@@ -255,7 +269,7 @@ class StripePaymentDriver extends BasePaymentDriver
      * Returns the Stripe publishable key
      * @return NULL|string The stripe publishable key
      */
-    public function getPublishableKey() :?string
+    public function getPublishableKey(): ?string
     {
         return $this->company_gateway->getPublishableKey();
     }
@@ -265,7 +279,7 @@ class StripePaymentDriver extends BasePaymentDriver
      *
      * @return NULL|\Stripe\Customer A Stripe customer object
      */
-    public function findOrCreateCustomer() :?\Stripe\Customer
+    public function findOrCreateCustomer(): ?\Stripe\Customer
     {
         $customer = null;
 
@@ -298,36 +312,34 @@ class StripePaymentDriver extends BasePaymentDriver
         $this->gateway();
 
         $response = $this->gateway
-            ->refund(['transactionReference'=>$payment->transaction_reference, 'amount' => $amount, 'currency' => $payment->client->getCurrencyCode()])
+            ->refund(['transactionReference' => $payment->transaction_reference, 'amount' => $amount, 'currency' => $payment->client->getCurrencyCode()])
             ->send();
 
         if ($response->isSuccessful()) {
-            SystemLogger::dispatch(
-                [
-                    'server_response' => $response->getMessage(),
-                    'data' => request()->all(),
-                ],
-                SystemLog::CATEGORY_GATEWAY_RESPONSE,
-                SystemLog::EVENT_GATEWAY_SUCCESS,
-                SystemLog::TYPE_PAYPAL,
-                $this->client
-            );
+            SystemLogger::dispatch([
+                'server_response' => $response->getMessage(), 'data' => request()->all(),
+            ], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_STRIPE, $this->client);
 
-            return true;
+            return [
+                'transaction_reference' => $response->getData()['id'],
+                'transaction_response' => json_encode($response->getData()),
+                'success' => $response->getData()['refunded'],
+                'description' => $response->getData()['description'],
+                'code' => $response->getCode(),
+            ];
         }
 
-        SystemLogger::dispatch(
-            [
-                'server_response' => $response->getMessage(),
-                'data' => request()->all(),
-            ],
-            SystemLog::CATEGORY_GATEWAY_RESPONSE,
-            SystemLog::EVENT_GATEWAY_FAILURE,
-            SystemLog::TYPE_PAYPAL,
-            $this->client
-        );
+        SystemLogger::dispatch([
+            'server_response' => $response->getMessage(), 'data' => request()->all(),
+        ], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_STRIPE, $this->client);
 
-        return false;
+        return [
+            'transaction_reference' => null,
+            'transaction_response' => json_encode($response->getData()),
+            'success' => false,
+            'description' => $response->getData()['error']['message'],
+            'code' => $response->getData()['error']['code'],
+        ];
     }
 
     public function verificationView(ClientGatewayToken $payment_method)
diff --git a/app/Services/Payment/RefundPayment.php b/app/Services/Payment/RefundPayment.php
index 677df382d8be..fa4d4667c517 100644
--- a/app/Services/Payment/RefundPayment.php
+++ b/app/Services/Payment/RefundPayment.php
@@ -24,6 +24,8 @@ class RefundPayment
 
     private $gateway_refund_status;
 
+    private $activity_repository;
+
     public function __construct($payment, $refund_data)
     {
         $this->payment = $payment;
@@ -33,6 +35,8 @@ class RefundPayment
         $this->total_refund = 0;
 
         $this->gateway_refund_status = false;
+
+        $this->activity_repository = new ActivityRepository();
     }
 
     /**
@@ -41,40 +45,48 @@ class RefundPayment
     {
 
         return $this->calculateTotalRefund() //sets amount for the refund (needed if we are refunding multiple invoices in one payment)
-                    ->setStatus() //sets status of payment
-                    ->buildCreditNote() //generate the credit note
-                    ->buildCreditLineItems() //generate the credit note items
-                    ->updateCreditables() //return the credits first
-                    ->updatePaymentables() //update the paymentable items
-                    ->adjustInvoices()
-                    ->createActivity() // create the refund activity
-                    ->processGatewayRefund() //process the gateway refund if needed
-                    ->save();
+            ->setStatus() //sets status of payment
+            ->buildCreditNote() //generate the credit note
+            ->buildCreditLineItems() //generate the credit note items
+            ->updateCreditables() //return the credits first
+            ->updatePaymentables() //update the paymentable items
+            ->adjustInvoices()
+            ->createActivity() // create the refund activity
+            ->processGatewayRefund() //process the gateway refund if needed
+            ->save();
     }
 
     private function processGatewayRefund()
     {
-
         if ($this->refund_data['gateway_refund'] !== false && $this->total_refund > 0) {
-
-            $gateway = CompanyGateway::find($this->payment->company_gateway_id);
+            $gateway = CompanyGateway::first();
 
             if ($gateway) {
                 $response = $gateway->driver($this->payment->client)->refund($this->payment, $this->total_refund);
 
-                if (!$response) {
+                if ($response['success']) {
                     throw new PaymentRefundFailed();
                 }
-                info(print_r($response,1));
-                //todo
-                //need to check the gateway response has successfully be transacted.
 
-                //if a credit has been generated I think this is the correct section to fix the balance of the credit
+                $this->payment->refunded = $this->total_refund;
+
+                $activity = [
+                    'payment_id' => $this->payment->id,
+                    'user_id' => $this->payment->user->id,
+                    'company_id' => $this->payment->company->id,
+                    'activity_type_id' => Activity::REFUNDED_PAYMENT,
+                    'credit_id' => 1, // ???
+                    'notes' => $response,
+                ];
+
+                /** Persist activiy to database. */
+                // $this->activity_repository->save($activity, ??);
+
+                /** Substract credit amount from the refunded value. */
             }
-        }
-        else
+        } else {
             $this->payment->refunded += $this->total_refund;
-
+        }
 
         return $this;
     }
@@ -105,7 +117,7 @@ class RefundPayment
     private function calculateTotalRefund()
     {
 
-        if(isset($this->refund_data['invoices']) && count($this->refund_data['invoices']) > 0)
+        if (isset($this->refund_data['invoices']) && count($this->refund_data['invoices']) > 0)
             $this->total_refund = collect($this->refund_data['invoices'])->sum('amount');
         else
             $this->total_refund = $this->refund_data['amount'];
@@ -145,10 +157,8 @@ class RefundPayment
     {
         $ledger_string = '';
 
-        if(isset($this->refund_data['invoices']) && count($this->refund_data['invoices']) > 0)
-        {
-            foreach ($this->refund_data['invoices'] as $invoice) 
-            {
+        if (isset($this->refund_data['invoices']) && count($this->refund_data['invoices']) > 0) {
+            foreach ($this->refund_data['invoices'] as $invoice) {
 
                 $inv = Invoice::find($invoice['invoice_id']);
 
@@ -164,9 +174,7 @@ class RefundPayment
 
                 $line_items[] = $credit_line_item;
             }
-        }
-        else
-        {
+        } else {
 
             $credit_line_item = InvoiceItemFactory::create();
             $credit_line_item->quantity = 1;
@@ -177,7 +185,7 @@ class RefundPayment
             $credit_line_item->date = $this->refund_data['date'];
 
             $line_items = [];
-            $line_items[] = $credit_line_item;  
+            $line_items[] = $credit_line_item;
         }
 
         $this->credit_note->line_items = $line_items;
@@ -188,23 +196,19 @@ class RefundPayment
 
     private function updatePaymentables()
     {
-        if(isset($this->refund_data['invoices']) && count($this->refund_data['invoices']) > 0)
-        {
+        if (isset($this->refund_data['invoices']) && count($this->refund_data['invoices']) > 0) {
             $this->payment->invoices->each(function ($paymentable_invoice) {
 
-                collect($this->refund_data['invoices'])->each(function ($refunded_invoice) use($paymentable_invoice){
+                collect($this->refund_data['invoices'])->each(function ($refunded_invoice) use ($paymentable_invoice) {
 
-                    if($refunded_invoice['invoice_id'] == $paymentable_invoice->id)
-                    {
+                    if ($refunded_invoice['invoice_id'] == $paymentable_invoice->id) {
                         $paymentable_invoice->pivot->refunded += $refunded_invoice['amount'];
                         $paymentable_invoice->pivot->save();
                     }
-
                 });
-
             });
         }
-        
+
         return $this;
     }
 
@@ -248,8 +252,7 @@ class RefundPayment
     {
         $adjustment_amount = 0;
 
-        if(isset($this->refund_data['invoices']) && count($this->refund_data['invoices']) > 0)
-        {
+        if (isset($this->refund_data['invoices']) && count($this->refund_data['invoices']) > 0) {
             foreach ($this->refund_data['invoices'] as $refunded_invoice) {
                 $invoice = Invoice::find($refunded_invoice['invoice_id']);
 
@@ -277,7 +280,6 @@ class RefundPayment
 
             $this->payment->client->paid_to_date -= $this->refund_data['amount'];
             $this->payment->client->save();
-
         }
 
         return $this;