diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
new file mode 100644
index 000000000000..ae556d59d058
--- /dev/null
+++ b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Controllers\ClientPortal;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class PaymentMethodController extends Controller
+{
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy()
+    {
+
+    }
+}
diff --git a/app/Models/AccountGateway.php b/app/Models/AccountGateway.php
deleted file mode 100644
index 2d3ac6e9cbc9..000000000000
--- a/app/Models/AccountGateway.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com)
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://opensource.org/licenses/AAL
- */
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class AccountGateway extends BaseModel
-{
-    //
-}
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
new file mode 100644
index 000000000000..5bedbed39d7c
--- /dev/null
+++ b/app/Models/CompanyGateway.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Models;
+
+use App\Models\Company;
+use Illuminate\Database\Eloquent\Model;
+
+class CompanyGateway extends Model
+{
+    public static $creditCards = 
+    	[
+            1 => ['card' => 'images/credit_cards/Test-Visa-Icon.png', 'text' => 'Visa'],
+            2 => ['card' => 'images/credit_cards/Test-MasterCard-Icon.png', 'text' => 'Master Card'],
+            4 => ['card' => 'images/credit_cards/Test-AmericanExpress-Icon.png', 'text' => 'American Express'],
+            8 => ['card' => 'images/credit_cards/Test-Diners-Icon.png', 'text' => 'Diners'],
+            16 => ['card' => 'images/credit_cards/Test-Discover-Icon.png', 'text' => 'Discover'],
+        ];
+
+    public function company()
+    {
+    	return $this->belongsTo(Company::class);
+    }
+}
diff --git a/app/Models/Presenters/ClientPresenter.php b/app/Models/Presenters/ClientPresenter.php
index 78e6b7d9c19c..bc5055a5dac0 100644
--- a/app/Models/Presenters/ClientPresenter.php
+++ b/app/Models/Presenters/ClientPresenter.php
@@ -47,38 +47,6 @@ class ClientPresenter extends EntityPresenter
         return $str;
     }
 
-    public function getCityState()
-    {
-        $client = $this->entity;
-        $swap = $client->country && $client->country->swap_postal_code;
 
-        $city = e($client->city);
-        $state = e($client->state);
-        $postalCode = e($client->postal_code);
-
-        if ($city || $state || $postalCode) {
-            return $this->cityStateZip($city, $state, $postalCode, $swap);
-        } else {
-            return false;
-        }
-    }
-
-	public function cityStateZip($city, $state, $postalCode, $swap)
-    {
-        $str = $city;
-
-        if ($state) {
-            if ($str) {
-                $str .= ', ';
-            }
-            $str .= $state;
-        }
-
-        if ($swap) {
-            return $postalCode . ' ' . $str;
-        } else {
-            return $str . ' ' . $postalCode;
-        }
-    }
 
 }
diff --git a/routes/client.php b/routes/client.php
index ba4a7a11edc3..013762e61e43 100644
--- a/routes/client.php
+++ b/routes/client.php
@@ -23,12 +23,13 @@ Route::group(['middleware' => ['auth:contact'], 'prefix' => 'client', 'as' => 'c
 	
 	Route::get('payments', 'ClientPortal\PaymentController@index')->name('payments.index'); 
 
-
 	Route::get('profile/{client_contact}/edit', 'ClientPortal\ProfileController@edit')->name('profile.edit');
 	Route::put('profile/{client_contact}/edit', 'ClientPortal\ProfileController@update')->name('profile.update');
 	Route::put('profile/{client_contact}/edit_client', 'ClientPortal\ProfileController@updateClient')->name('profile.edit_client');
 	Route::put('profile/{client_contact}/localization', 'ClientPortal\ProfileController@updateClientLocalization')->name('profile.edit_localization');
 
+	Route::resource('payment_methods', 'ClientPortal\PaymentMethodController');// name = (payment_methods. index / create / show / update / destroy / edit
+
 	Route::post('document', 'ClientPortal\DocumentController@store')->name('document.store');
 	Route::delete('document', 'ClientPortal\DocumentController@destroy')->name('document.destroy');