diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index 02697ba039de..65175cdd5ba1 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -34,6 +34,13 @@ class AccountApiController extends BaseAPIController
         $this->accountRepo = $accountRepo;
     }
 
+    public function ping()
+    {
+        $headers = Utils::getApiHeaders();
+
+        return Response::make(RESULT_SUCCESS, 200, $headers);
+    }
+
     public function register(RegisterRequest $request)
     {
 
diff --git a/app/Http/Controllers/BaseAPIController.php b/app/Http/Controllers/BaseAPIController.php
index 4d03dea14b1d..7bfdfc931c90 100644
--- a/app/Http/Controllers/BaseAPIController.php
+++ b/app/Http/Controllers/BaseAPIController.php
@@ -68,7 +68,19 @@ class BaseAPIController extends Controller
         }
     }
 
-    protected function returnList($query)
+    protected function handleAction($request)
+    { 
+        $entity = $request->entity();
+        $action = $request->action;
+        
+        $repo = Utils::toCamelCase($this->entityType) . 'Repo';
+        
+        $this->$repo->$action($entity);
+        
+        return $this->itemResponse($entity);
+    }
+
+    protected function listResponse($query)
     {
         //\DB::enableQueryLog();
         if ($clientPublicId = Input::get('client_id')) {
@@ -95,6 +107,16 @@ class BaseAPIController extends Controller
         return $this->response($data);
     }
 
+    protected function itemResponse($item)
+    {
+        $transformerClass = EntityModel::getTransformerName($this->entityType);
+        $transformer = new $transformerClass(Auth::user()->account, Input::get('serializer'));        
+
+        $data = $this->createItem($item, $transformer, $this->entityType);
+
+        return $this->response($data);
+    }
+
     protected function createItem($data, $transformer, $entityType)
     {
         if ($this->serializer && $this->serializer != API_SERIALIZER_JSON) {
@@ -155,7 +177,6 @@ class BaseAPIController extends Controller
 
     }
 
-
     protected function getIncluded()
     {
         $data = ['user'];
diff --git a/app/Http/Controllers/ClientApiController.php b/app/Http/Controllers/ClientApiController.php
index 4457973c7031..83689e274318 100644
--- a/app/Http/Controllers/ClientApiController.php
+++ b/app/Http/Controllers/ClientApiController.php
@@ -10,29 +10,19 @@ use App\Ninja\Repositories\ClientRepository;
 use App\Http\Requests\CreateClientRequest;
 use App\Http\Controllers\BaseAPIController;
 use App\Ninja\Transformers\ClientTransformer;
-use App\Services\ClientService;
 use App\Http\Requests\UpdateClientRequest;
 
 class ClientApiController extends BaseAPIController
 {
     protected $clientRepo;
-    protected $clientService;
 
     protected $entityType = ENTITY_CLIENT;
 
-    public function __construct(ClientRepository $clientRepo, ClientService $clientService)
+    public function __construct(ClientRepository $clientRepo)
     {
         parent::__construct();
 
         $this->clientRepo = $clientRepo;
-        $this->clientService = $clientService;
-    }
-
-    public function ping()
-    {
-        $headers = Utils::getApiHeaders();
-
-        return Response::make('', 200, $headers);
     }
 
     /**
@@ -65,7 +55,7 @@ class ClientApiController extends BaseAPIController
             });
         }
         
-        return $this->returnList($clients);
+        return $this->listResponse($clients);
     }
 
     /**
@@ -93,14 +83,7 @@ class ClientApiController extends BaseAPIController
     {
         $client = $this->clientRepo->save($request->input());
 
-        $client = Client::scope($client->public_id)
-            ->with('country', 'contacts', 'industry', 'size', 'currency')
-            ->first();
-
-        $transformer = new ClientTransformer(Auth::user()->account, Input::get('serializer'));
-        $data = $this->createItem($client, $transformer, ENTITY_CLIENT);
-
-        return $this->response($data);
+        return $this->itemResponse($client);
     }
 
     /**
@@ -127,51 +110,15 @@ class ClientApiController extends BaseAPIController
 
     public function update(UpdateClientRequest $request, $publicId)
     {
-        if ($request->action == ACTION_ARCHIVE) {
-
-
-            $client = Client::scope($publicId)->withTrashed()->first();
-
-            if(!$client)
-                return $this->errorResponse(['message'=>'Record not found'], 400);
-
-            $this->clientRepo->archive($client);
-
-            $transformer = new ClientTransformer(Auth::user()->account, Input::get('serializer'));
-            $data = $this->createItem($client, $transformer, ENTITY_CLIENT);
-
-            return $this->response($data);
+        if ($request->action) {
+            return $this->handleAction($request);
         }
-        else if ($request->action == ACTION_RESTORE){
-
-            $client = Client::scope($publicId)->withTrashed()->first();
-
-            if(!$client)
-                return $this->errorResponse(['message'=>'Client not found.'], 400);
-
-            $this->clientRepo->restore($client);
-
-            $transformer = new ClientTransformer(Auth::user()->account, Input::get('serializer'));
-            $data = $this->createItem($client, $transformer, ENTITY_CLIENT);
-
-            return $this->response($data);
-        }
-
+        
         $data = $request->input();
         $data['public_id'] = $publicId;
-        $this->clientRepo->save($data);
+        $client = $this->clientRepo->save($data);
 
-        $client = Client::scope($publicId)
-            ->with('country', 'contacts', 'industry', 'size', 'currency')
-            ->first();
-
-        if(!$client)
-            return $this->errorResponse(['message'=>'Client not found.'],400);
-
-        $transformer = new ClientTransformer(Auth::user()->account, Input::get('serializer'));
-        $data = $this->createItem($client, $transformer, ENTITY_CLIENT);
-
-        return $this->response($data);
+        return $this->itemResponse($client);
     }
 
 
diff --git a/app/Http/Controllers/ExpenseApiController.php b/app/Http/Controllers/ExpenseApiController.php
index 9b1a7e906244..44722f2a18ce 100644
--- a/app/Http/Controllers/ExpenseApiController.php
+++ b/app/Http/Controllers/ExpenseApiController.php
@@ -32,7 +32,7 @@ class ExpenseApiController extends BaseAPIController
             ->withTrashed()
             ->orderBy('created_at','desc');
 
-        return $this->returnList($expenses);
+        return $this->listResponse($expenses);
     }
 
     public function update()
diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php
index ce5eaa1d72d6..1ff6aa71faeb 100644
--- a/app/Http/Controllers/InvoiceApiController.php
+++ b/app/Http/Controllers/InvoiceApiController.php
@@ -62,7 +62,7 @@ class InvoiceApiController extends BaseAPIController
                         ->with(array_merge(['invoice_items'], $this->getIncluded()))
                         ->orderBy('created_at', 'desc');
 
-        return $this->returnList($invoices);
+        return $this->listResponse($invoices);
     }
 
         /**
diff --git a/app/Http/Controllers/PaymentApiController.php b/app/Http/Controllers/PaymentApiController.php
index a7cab011fc36..e37e74971be3 100644
--- a/app/Http/Controllers/PaymentApiController.php
+++ b/app/Http/Controllers/PaymentApiController.php
@@ -12,6 +12,8 @@ use App\Ninja\Repositories\PaymentRepository;
 use App\Http\Controllers\BaseAPIController;
 use App\Ninja\Transformers\PaymentTransformer;
 use App\Ninja\Transformers\InvoiceTransformer;
+use App\Http\Requests\UpdatePaymentRequest;
+use App\Http\Requests\CreatePaymentAPIRequest;
 
 class PaymentApiController extends BaseAPIController
 {
@@ -50,7 +52,7 @@ class PaymentApiController extends BaseAPIController
                         ->with(array_merge(['client.contacts', 'invitation', 'user', 'invoice'], $this->getIncluded()))                        
                         ->orderBy('created_at', 'desc');
 
-        return $this->returnList($payments);
+        return $this->listResponse($payments);
     }
 
     /**
@@ -75,39 +77,17 @@ class PaymentApiController extends BaseAPIController
     * )
     */
 
-    public function update(Request $request, $publicId)
+    public function update(UpdatePaymentRequest $request, $publicId)
     {
-        $data = Input::all();
-        $data['public_id'] = $publicId;
-        $error = false;
-
-        if ($request->action == ACTION_ARCHIVE) {
-            $payment = Payment::scope($publicId)->withTrashed()->firstOrFail();
-            $this->paymentRepo->archive($payment);
-
-            $transformer = new PaymentTransformer(\Auth::user()->account, Input::get('serializer'));
-            $data = $this->createItem($payment, $transformer, 'invoice');
-
-            return $this->response($data);
+        if ($request->action) {
+            return $this->handleAction($request);
         }
 
+        $data = $request->input();
+        $data['public_id'] = $publicId;
         $payment = $this->paymentRepo->save($data);
 
-        if ($error) {
-            return $error;
-        }
-
-        /*
-        $invoice = Invoice::scope($data['invoice_id'])->with('client', 'invoice_items', 'invitations')->with(['payments' => function($query) {
-            $query->withTrashed();
-        }])->withTrashed()->first();
-        */
-
-        $transformer = new PaymentTransformer(\Auth::user()->account, Input::get('serializer'));
-        $data = $this->createItem($payment, $transformer, 'invoice');
-
-        return $this->response($data);
-
+        return $this->itemResponse($payment);
     }
 
 
@@ -132,49 +112,15 @@ class PaymentApiController extends BaseAPIController
      *   )
      * )
      */
-    public function store()
+    public function store(CreatePaymentAPIRequest $request)
     {
-        $data = Input::all();
-        $error = false;
-
-        if (isset($data['invoice_id'])) {
-            $invoice = Invoice::scope($data['invoice_id'])->with('client')->first();
-
-            if ($invoice) {
-                $data['invoice_id'] = $invoice->id;
-                $data['client_id'] = $invoice->client->id;
-            } else {
-                $error = trans('validation.not_in', ['attribute' => 'invoice_id']);
-            }
-        } else {
-            $error = trans('validation.not_in', ['attribute' => 'invoice_id']);
-        }
-
-        if (!isset($data['transaction_reference'])) {
-            $data['transaction_reference'] = '';
-        }
-
-        if ($error) {
-            return $error;
-        }
-
-        $payment = $this->paymentRepo->save($data);
+        $payment = $this->paymentRepo->save($request->input());
 
         if (Input::get('email_receipt')) {
             $this->contactMailer->sendPaymentConfirmation($payment);
         }
 
-        /*
-        $invoice = Invoice::scope($invoice->public_id)->with('client', 'invoice_items', 'invitations')->with(['payments' => function($query) {
-            $query->withTrashed();
-        }])->first();
-        */
-
-        $transformer = new PaymentTransformer(\Auth::user()->account, Input::get('serializer'));
-        $data = $this->createItem($payment, $transformer, 'invoice');
-
-        return $this->response($data);
-
+        return $this->itemResponse($payment);
     }
 
     /**
diff --git a/app/Http/Controllers/ProductApiController.php b/app/Http/Controllers/ProductApiController.php
index 26736f5ef5c2..1d3e4577048c 100644
--- a/app/Http/Controllers/ProductApiController.php
+++ b/app/Http/Controllers/ProductApiController.php
@@ -38,7 +38,7 @@ class ProductApiController extends BaseAPIController
                         ->withTrashed()
                         ->orderBy('created_at', 'desc');
 
-        return $this->returnList($products);
+        return $this->listResponse($products);
     }
 
     public function getDatatable()
diff --git a/app/Http/Controllers/TaskApiController.php b/app/Http/Controllers/TaskApiController.php
index cb39e0a1f369..5e5e05ef80e9 100644
--- a/app/Http/Controllers/TaskApiController.php
+++ b/app/Http/Controllers/TaskApiController.php
@@ -45,7 +45,7 @@ class TaskApiController extends BaseAPIController
                         ->with($this->getIncluded())                        
                         ->orderBy('created_at', 'desc');
 
-        return $this->returnList($payments);
+        return $this->listResponse($payments);
     }
 
     /**
diff --git a/app/Http/Controllers/TaxRateApiController.php b/app/Http/Controllers/TaxRateApiController.php
index ddc0ab4aa968..1aa5417d9563 100644
--- a/app/Http/Controllers/TaxRateApiController.php
+++ b/app/Http/Controllers/TaxRateApiController.php
@@ -30,7 +30,7 @@ class TaxRateApiController extends BaseAPIController
                         ->withTrashed()
                         ->orderBy('created_at', 'desc');
         
-        return $this->returnList($taxRates);
+        return $this->listResponse($taxRates);
     }
 
     public function store(CreateTaxRateRequest $request)
diff --git a/app/Http/Controllers/UserApiController.php b/app/Http/Controllers/UserApiController.php
index 8fda74b33cbd..6786e4046544 100644
--- a/app/Http/Controllers/UserApiController.php
+++ b/app/Http/Controllers/UserApiController.php
@@ -30,7 +30,7 @@ class UserApiController extends BaseAPIController
                         ->withTrashed()
                         ->orderBy('created_at', 'desc');
         
-        return $this->returnList($users);
+        return $this->listResponse($users);
     }
 
     /*
diff --git a/app/Http/Controllers/VendorApiController.php b/app/Http/Controllers/VendorApiController.php
index b2487dfda2d3..1dea751e790d 100644
--- a/app/Http/Controllers/VendorApiController.php
+++ b/app/Http/Controllers/VendorApiController.php
@@ -53,7 +53,7 @@ class VendorApiController extends BaseAPIController
                     ->withTrashed()
                     ->orderBy('created_at', 'desc');
 
-        return $this->returnList($vendors);
+        return $this->listResponse($vendors);
     }
 
     /**
diff --git a/app/Http/Requests/CreatePaymentAPIRequest.php b/app/Http/Requests/CreatePaymentAPIRequest.php
new file mode 100644
index 000000000000..08a520c16655
--- /dev/null
+++ b/app/Http/Requests/CreatePaymentAPIRequest.php
@@ -0,0 +1,48 @@
+<?php namespace App\Http\Requests;
+
+use App\Models\Invoice;
+
+class CreatePaymentAPIRequest extends PaymentRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return $this->user()->can('create', ENTITY_PAYMENT);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        if ( ! $this->invoice_id || ! $this->amount) {
+            return [
+                'invoice_id' => 'required',
+                'amount' => 'required',
+            ];
+        }
+        
+        $invoice = Invoice::scope($this->invoice_id)->firstOrFail();
+
+        $this->merge([
+            'invoice_id' => $invoice->id, 
+            'client_id' => $invoice->client->id,
+        ]);
+            
+        $rules = array(
+            'amount' => "required|less_than:{$invoice->balance}|positive",
+        );
+
+        if ($this->payment_type_id == PAYMENT_TYPE_CREDIT) {
+            $rules['payment_type_id'] = 'has_credit:' . $invoice->client->public_id . ',' . $this->amount;
+        }
+
+        return $rules;
+    }
+}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 768c9c3d3d4c..386d02427e0b 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -246,7 +246,7 @@ Route::group([
 // Route groups for API
 Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function()
 {
-    Route::get('ping', 'ClientApiController@ping');
+    Route::get('ping', 'AccountApiController@ping');
     Route::post('login', 'AccountApiController@login');
     Route::post('register', 'AccountApiController@register');
     Route::get('static', 'AccountApiController@getStaticData');
diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php
index c2c9110fe306..95e85e6acef4 100644
--- a/app/Models/EntityModel.php
+++ b/app/Models/EntityModel.php
@@ -110,7 +110,7 @@ class EntityModel extends Eloquent
     {
         return 'App\\Ninja\\Transformers\\' . ucwords(Utils::toCamelCase($entityType)) . 'Transformer';
     }
-
+    
     public function setNullValues()
     {
         foreach ($this->fillable as $field) {