diff --git a/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php
new file mode 100644
index 00000000..4bde6135
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingTransferredAmount;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceConfigurations;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\Modules\Transactions\Services\CreatesWalletTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPaidAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Models\Wallet;
+use App\Models\Document;
+use App\Models\SegmentConstant;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+
+class CreateWalletTransactionProcessor
+{
+    /** @var CreatesWalletTransaction */
+    private $createsWalletTransaction;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    public function __construct(CreatesWalletTransaction $createsWalletTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber)
+    {
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsWalletTransaction = $createsWalletTransaction;
+    }
+
+
+    /**
+     * @param Booking $booking
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Wallet $wallet, WalletObject $walletOject, int $transactionType)
+    {
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('WAL-');
+
+        $transaction_object = new TransactionObject(
+            $billNumber,
+            $transactionType,
+            $wallet->company->id,
+            1,
+            1,
+            PaymentMethodType::BA,
+            $walletOject->getAmount(),
+            $walletOject->getAmount(),
+            $wallet->currency_id,
+            $wallet->currency_id,
+            0,
+            0,
+            0,
+            null,
+            ApprovalStatus::PENDING_SUBMISSION
+        );
+        $walletTransaction = $this->createsWalletTransaction->execute($wallet, $transaction_object);
+
+        return $walletTransaction;
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php
new file mode 100644
index 00000000..95f484a0
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingTransferredAmount;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceConfigurations;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\Modules\Transactions\Services\CreatesWalletTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPaidAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\Modules\Wallets\Services\UpdatesWallet;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Models\Wallet;
+use App\Models\Document;
+use App\Models\SegmentConstant;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+
+class UpdateWalletTransactionProcessor
+{
+    /** @var CreatesWalletTransaction */
+    private $createsWalletTransaction;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var ListWallet  */
+    private $fetchesWallet;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWallet $updatesWallet, FetchesTransaction $fetchesTransaction)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updatesWallet = $updatesWallet;
+    }
+
+
+    /**
+     * @param Booking $booking
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(int $transactionId, int $transactionStatus)
+    {
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $transactionId]);
+        $wallet = $transaction->wallet;
+
+        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $transaction->amount);
+
+        $this->updatesTransactionStatus->execute($transaction, $transactionStatus);
+
+        $this->updatesWallet->execute($wallet, $walletOject);
+
+        return $wallet;
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Services/CreatesWalletTransaction.php b/app/Classes/Modules/Transactions/Services/CreatesWalletTransaction.php
new file mode 100644
index 00000000..7c3eacd6
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/CreatesWalletTransaction.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Models\Wallet;
+use App\Models\Transaction;
+
+class CreatesWalletTransaction extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param TransactionObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Wallet $wallet, TransactionObject $object) {
+        $model = new Transaction();
+        $model->bill_no = $object->getBillNo();
+        $model->type = $object->getTransactionType();
+        $model->issuer = $object->getIssuer();
+        $model->receiver = $object->getReceiver();
+        $model->recipient_bank_account_id = $object->getRecipientBankAccountId();
+        $model->payment_method = $object->getPaymentMethod();
+        $model->amount = $object->getAmount();
+        $model->original_amount = $object->getOriginalAmount();
+        $model->currency_id = $object->getCurrencyId();
+        $model->original_currency_id = $object->getOriginalCurrencyId();
+        $model->currency_rate = $object->getCurrencyRate();
+        $model->tax = $object->getTax();
+        $model->service_charge = $object->getServiceCharge();
+        $model->expires_on = $object->getExpiresOn();
+        $model->status = $object->getStatus();
+        $model->booking_id = 0;
+
+        return $this->handler($wallet->transactions(), $model);
+
+    }
+}
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
index efcff6b3..f0a16958 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php
@@ -9,6 +9,7 @@ use App\Classes\Modules\Wallets\Services\CreatesWallet;
 use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
 use App\Classes\Modules\Wallets\Standards\Rules\CanCreateCompanyWallet;
 use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
 
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -38,14 +39,18 @@ class CreateWalletLogic extends AbstractControllerLogic
    /** @var CanCreateCompanyWallet */
    private $canCreateCompanyWallet;
 
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
     /**
      * CreateWalletLogic constructor.
      * @param CreatesWallet $createsWallet
      * @param GeneratesWalletCode $generatesWalletCode
      * @param CanCreateCompanyWallet $canCreateCompanyWallet
      */
-    public function __construct(CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet)
+    public function __construct(CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet, FetchesCompany $fetchesCompany)
     {
+        $this->fetchesCompany = $fetchesCompany;
         $this->createsWallet = $createsWallet;
         $this->generatesWalletCode = $generatesWalletCode;
         $this->canCreateCompanyWallet = $canCreateCompanyWallet;
@@ -58,24 +63,22 @@ class CreateWalletLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
 
             DB::beginTransaction();
 
 
-            $object = new WalletObject($request->input('currency_id'), $request->input('company_id'), $this->generatesWalletCode->execute());
+            $object = new WalletObject($request->input('company_id'), $request->input('currency_id'), $this->generatesWalletCode->execute());
 
             $this->canCreateCompanyWallet->passes($object);
 
-            $wallet = $this->createsWallet->execute($object);
+            $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+
+            $wallet = $this->createsWallet->execute($object, $company);
 
             DB::commit();
 
             return $this->resourceResponse(new WalletResource($wallet));
 
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
 
     }
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php
new file mode 100644
index 00000000..cf6b86bb
--- /dev/null
+++ b/app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
+use App\Http\Resources\WalletResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class ListWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'List Company Wallet',
+            'message' => 'You have successfully list company wallet'
+        ];
+    }
+
+    /** @var ListWallet  */
+   private $listsWallet;
+
+   /** @var CanCreateCompanyWallet */
+   private $canListWallet;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(CanListWallet $canListWallet, ListsWallet $listsWallet)
+    {
+        $this->canListWallet = $canListWallet;
+        $this->listsWallet = $listsWallet;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        //$this->canListWallet->passes();
+
+        $query = $this->listsWallet->execute($this->listsWallet->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(WalletResource::collection($query));
+    }
+}
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
new file mode 100644
index 00000000..817a9038
--- /dev/null
+++ b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Transactions\Processors\CreateWalletTransactionProcessor;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class TopUpWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'TopUp into Company Wallet',
+            'message' => 'You have successfully topup company wallet'
+        ];
+    }
+
+    /** @var ListWallet  */
+   private $fetchesWallet;
+
+   /** @var CanCreateCompanyWallet */
+   private $canListWallet;
+
+    /** @var CreateInvoiceTransactionProcessor */
+    private $createWalletTransactionProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor)
+    {
+        $this->fetchesWallet = $fetchesWallet;
+        $this->createWalletTransactionProcessor = $createWalletTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        //$this->canListWallet->passes();
+        $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]);
+
+        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $request->input('amount'));
+        $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::TOP_UP);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+
+    }
+}
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php
new file mode 100644
index 00000000..a14051b7
--- /dev/null
+++ b/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Transactions\Processors\UpdateWalletTransactionProcessor;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class UpdateStatusWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Status Transaction Company Wallet',
+            'message' => 'You have successfully status transaction company wallet'
+        ];
+    }
+
+    /** @var ListWallet  */
+   private $fetchesWallet;
+
+   /** @var CanCreateCompanyWallet */
+   private $canListWallet;
+
+    /** @var UpdateWalletTransactionProcessor */
+    private $updateWalletTransactionProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(FetchesWallet $fetchesWallet, UpdateWalletTransactionProcessor $updateWalletTransactionProcessor)
+    {
+        $this->fetchesWallet = $fetchesWallet;
+        $this->updateWalletTransactionProcessor = $updateWalletTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $wallet = $this->updateWalletTransactionProcessor->execute($request->input('id'), $request->input('status'));
+
+        return $this->resourceResponse(new WalletResource($wallet));
+
+    }
+}
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php
new file mode 100644
index 00000000..3a2bb21a
--- /dev/null
+++ b/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\ListsWallet;
+use App\Classes\Modules\Wallets\Services\FetchesWallet;
+use App\Classes\ValueObjects\Constants\TransactionType;
+
+use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
+use App\Http\Resources\WalletResource;
+use App\Classes\Modules\Transactions\Processors\CreateWalletTransactionProcessor;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class WithdrawWalletLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Withdraw from Company Wallet',
+            'message' => 'You have successfully withdraw company wallet'
+        ];
+    }
+
+    /** @var ListWallet  */
+   private $fetchesWallet;
+
+   /** @var CanCreateCompanyWallet */
+   private $canListWallet;
+
+    /** @var CreateInvoiceTransactionProcessor */
+    private $createWalletTransactionProcessor;
+
+    /**
+     * CreateWalletLogic constructor.
+     * @param CreatesWallet $createsWallet
+     * @param GeneratesWalletCode $generatesWalletCode
+     * @param CanCreateCompanyWallet $canCreateCompanyWallet
+     */
+    public function __construct(FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor)
+    {
+        $this->fetchesWallet = $fetchesWallet;
+        $this->createWalletTransactionProcessor = $createWalletTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        //$this->canListWallet->passes();
+        $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]);
+
+        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $request->input('amount'));
+        $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::WITHDRAW);
+
+        return $this->resourceResponse(new WalletResource($wallet));
+
+    }
+}
diff --git a/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php b/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php
index 6f4fcd83..4bfae2f4 100644
--- a/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php
+++ b/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php
@@ -16,17 +16,20 @@ class WalletObject implements DataTransferObject
 	/** @var int */
 	private $code;
 
+    private $amount;
+
     /**
      * WalletObject constructor.
      * @param int $company_id
      * @param int $currency
      * @param int $code
      */
-    public function __construct(int $company_id, int $currency, int $code)
+    public function __construct(int $company_id, int $currency, int $code, float $amount=0)
     {
         $this->company_id = $company_id;
         $this->currency_id = $currency;
         $this->code = $code;
+        $this->amount = $amount;
     }
 
     /**
@@ -53,7 +56,10 @@ class WalletObject implements DataTransferObject
         return $this->code;
     }
 
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
 
 
-
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Wallets/Services/CreatesWallet.php b/app/Classes/Modules/Wallets/Services/CreatesWallet.php
index 720049cb..c114b9de 100644
--- a/app/Classes/Modules/Wallets/Services/CreatesWallet.php
+++ b/app/Classes/Modules/Wallets/Services/CreatesWallet.php
@@ -3,24 +3,26 @@
 namespace App\Classes\Modules\Wallets\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
 use App\Models\Wallet;
+use App\Models\Company;
 
-class CreatesWallet extends AbstractUpdateRecord
+class CreatesWallet extends AbstractUpdateRelationshipRecord
 {
     /**
      * @param WalletObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(WalletObject $object) {
+    public function execute(WalletObject $object, Company $company) {
         $model = new Wallet();
-        $model->company_id = $object->getCompanyId();
+        //$model->company_id = $object->getCompanyId();
         $model->code = $object->getCode();
         $model->currency_id = $object->getCurrency();
 
 
-        return $this->handler($model);
+        return $this->handler($company->wallets(), $model);
 
     }
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Wallets/Services/ListsWallet.php b/app/Classes/Modules/Wallets/Services/ListsWallet.php
new file mode 100644
index 00000000..c11e2063
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Services/ListsWallet.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use Illuminate\Database\Eloquent\Builder;
+use App\Classes\General\Eloquent\AbstractListRecord;
+use App\Models\Wallet;
+
+class ListsWallet extends AbstractListRecord
+{
+    /** @var Booking */
+    private $repository;
+
+    /**
+     * ListsBookings constructor.
+     * @param Booking $repository
+     */
+    public function __construct(Wallet $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Wallets/Services/UpdatesWallet.php b/app/Classes/Modules/Wallets/Services/UpdatesWallet.php
new file mode 100644
index 00000000..24ce2415
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Services/UpdatesWallet.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Models\Wallet;
+use App\Models\Company;
+
+class UpdatesWallet extends AbstractUpdateRecord
+{
+    /**
+     * @param WalletObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Wallet $model, WalletObject  $object) {
+        $model->amount += $object->getAmount();
+        $model->code = $object->getCode();
+        $model->currency_id = $object->getCurrency();
+
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php
new file mode 100644
index 00000000..c87cb316
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\ListWalletValidation;
+
+class CanListWallet extends AbstractRule
+{
+
+    /** @var ListWalletValidation */
+    private $listWalletValidation;
+
+
+    public function __construct(ListWalletValidation $listWalletValidation)
+    {
+        $this->listWalletValidation = $listWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->listWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php
new file mode 100644
index 00000000..9a005498
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\TopUpWalletValidation;
+
+class CanTopUpWallet extends AbstractRule
+{
+
+    /** @var TopUpWalletValidation */
+    private $topUpWalletValidation;
+
+
+    public function __construct(TopUpWalletValidation $topUpWalletValidation)
+    {
+        $this->topUpWalletValidation = $topUpWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->topUpWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php
new file mode 100644
index 00000000..6fb4019d
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Standards\Validators\WithdrawWalletValidation;
+
+class CanWithdrawWallet extends AbstractRule
+{
+
+    /** @var WithdrawWalletValidation */
+    private $witdrawWalletValidation;
+
+
+    public function __construct(WithdrawWalletValidation $witdrawWalletValidation)
+    {
+        $this->witdrawWalletValidation = $witdrawWalletValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param WalletObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->witdrawWalletValidation->validate($object);
+    }
+
+    /**
+     * @param WalletTransactionObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php b/app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php
new file mode 100644
index 00000000..1f75aa54
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class ListWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Validators/TopUpWalletValidation.php b/app/Classes/Modules/Wallets/Standards/Validators/TopUpWalletValidation.php
new file mode 100644
index 00000000..d2e1244c
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Validators/TopUpWalletValidation.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class TopUpWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Classes/Modules/Wallets/Standards/Validators/WithdrawWalletValidation.php b/app/Classes/Modules/Wallets/Standards/Validators/WithdrawWalletValidation.php
new file mode 100644
index 00000000..78660228
--- /dev/null
+++ b/app/Classes/Modules/Wallets/Standards/Validators/WithdrawWalletValidation.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\Wallets\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+
+class WithdrawWalletValidation extends AbstractValidation
+{
+
+    protected function data($object): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Classes/ValueObjects/Constants/TransactionType.php b/app/Classes/ValueObjects/Constants/TransactionType.php
index c3d9eb64..05771c12 100644
--- a/app/Classes/ValueObjects/Constants/TransactionType.php
+++ b/app/Classes/ValueObjects/Constants/TransactionType.php
@@ -23,4 +23,6 @@ final class TransactionType {
     public const SUPPLIER_DELIVER = 8;
 
     public const CREDIT_NOTE = 9;
+
+    public const WITHDRAW = 10;
 }
diff --git a/app/Http/Controllers/Wallets/ListWalletController.php b/app/Http/Controllers/Wallets/ListWalletController.php
new file mode 100644
index 00000000..45b2f1d1
--- /dev/null
+++ b/app/Http/Controllers/Wallets/ListWalletController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\ListWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListWalletController
+{
+    public function list(Request $request, ListWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Wallets/TopUpWalletController.php b/app/Http/Controllers/Wallets/TopUpWalletController.php
new file mode 100644
index 00000000..aaa707bd
--- /dev/null
+++ b/app/Http/Controllers/Wallets/TopUpWalletController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\TopUpWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class TopUpWalletController
+{
+
+    public function topUp(Request $request, TopUpWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Wallets/UpdateStatusWalletController.php b/app/Http/Controllers/Wallets/UpdateStatusWalletController.php
new file mode 100644
index 00000000..21eea924
--- /dev/null
+++ b/app/Http/Controllers/Wallets/UpdateStatusWalletController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\UpdateStatusWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateStatusWalletController
+{
+    public function updateStatus(Request $request, UpdateStatusWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Wallets/WithdrawWalletController.php b/app/Http/Controllers/Wallets/WithdrawWalletController.php
new file mode 100644
index 00000000..0d125aa7
--- /dev/null
+++ b/app/Http/Controllers/Wallets/WithdrawWalletController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers\Wallets;
+
+use App\Classes\Modules\Wallets\ControllersLogic\CreateWalletLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class WithdrawWalletController
+{
+
+    public function withdraw(Request $request, CreateWalletLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Models/Company.php b/app/Models/Company.php
index c1a6a191..eba6677f 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -90,6 +90,14 @@ class Company extends AbstractModel implements Documentable
         return $this->HasMany(Booking::class, 'company_id');
     }
 
+    /**
+     * @return MorphMany
+     */
+    public function wallets(): morphMany
+    {
+        return $this->morphMany(Wallet::class, 'owner');
+    }
+
     /**
      * @return Builder
      */
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 9d1ed5b9..c290ac4b 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -10,18 +10,41 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 
 class Transaction extends AbstractModel implements Documentable
 {
     protected $table = 'transactions';
 
+    public function owner(): morphTo
+    {
+        return $this->morphTo();
+    }
+
     /**
+     * @return MorphMany
+     */
+    public function booking(): morphMany
+    {
+        //return $this->BelongsTo( Booking::class, 'booking_id', 'id');
+        return $this->morphMany(Booking::class, 'owner');
+    }
+
+      /**
+     * @return MorphMany
+     */
+    public function wallets(): morphMany
+    {
+        return $this->morphMany(Wallet::class, 'owner');
+    }
+
+     /**
      * @return BelongsTo
      */
-    public function booking(): BelongsTo
+    public function wallet(): BelongsTo
     {
-        return $this->BelongsTo( Booking::class, 'booking_id', 'id');
+        return $this->BelongsTo(Wallet::class, 'owner_id', 'id');
     }
 
     /**
diff --git a/app/Models/Wallet.php b/app/Models/Wallet.php
index f9808e9e..52d8f718 100644
--- a/app/Models/Wallet.php
+++ b/app/Models/Wallet.php
@@ -2,16 +2,34 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Relations\HasOne;
-
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 class Wallet extends AbstractModel
 {
-    protected $table = 'wallets';
+    use SoftDeletes;
 
-    public function company(): HasOne
+    protected $table = 'wallets';
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function owner(): morphTo
     {
-        return $this->hasOne(Company::class, 'company_id', 'id');
+        return $this->morphTo();
+    }
+    public function company(): BelongsTo
+    {
+        return $this->BelongsTo(Company::class, 'owner_id', 'id');
     }
 
+     /**
+     * @return morphMany
+     */
+    public function transactions(): morphMany
+    {
+        return $this->morphMany(Transaction::class, 'owner');
+    }
 }
diff --git a/database/migrations/2021_10_02_082211_drop_wallet_transactions_table.php b/database/migrations/2021_10_02_082211_drop_wallet_transactions_table.php
new file mode 100644
index 00000000..f16eeba3
--- /dev/null
+++ b/database/migrations/2021_10_02_082211_drop_wallet_transactions_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class DropWalletTransactionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::dropIfExists('wallet_transaction');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/migrations/2021_10_02_082442_alter_wallet_company_id.php b/database/migrations/2021_10_02_082442_alter_wallet_company_id.php
new file mode 100644
index 00000000..c1eba98a
--- /dev/null
+++ b/database/migrations/2021_10_02_082442_alter_wallet_company_id.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AlterWalletCompanyId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasColumn('wallets', 'company_id')) {
+            Schema::table('wallets', function (Blueprint $table) {
+                $table->dropForeign('wallets_company_id_foreign');
+                $table->dropColumn('company_id');
+            });
+        }
+
+        if (!Schema::hasColumn('wallets', 'owner_id')) {
+            Schema::table('wallets', function (Blueprint $table) {
+                $table->morphs('owner');
+            });
+
+            //In-case the model name lengthy
+            Schema::table('wallets', function (Blueprint $table) {
+                $table->string('owner_type', 250)->change();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php b/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php
new file mode 100644
index 00000000..e95c1e58
--- /dev/null
+++ b/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php
@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
+class AlterTransactionBookingId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!Schema::hasColumn('transactions', 'owner_id')) {
+            Schema::table('transactions', function (Blueprint $table) {
+                $table->morphs('owner');
+            });
+
+            //In-case the model name lengthy
+            Schema::table('transactions', function (Blueprint $table) {
+                $table->string('owner_type', 250)->change();
+            });
+
+            DB::statement("UPDATE transactions SET owner_type='App\\\\Models\\\\Booking', owner_id = booking_id");
+
+            Schema::table('transactions', function (Blueprint $table) {
+                $table->dropForeign('transactions_booking_id_foreign');
+                //$table->dropColumn('booking_id');
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index 146d519a..426033a3 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -14,7 +14,7 @@ use Illuminate\Support\Facades\Route;
 */
 
 Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function () {
-    
+
     require __DIR__ . '/account.php';
 
 //    Route::get('/rate/calculate', 'RateCalculateCurrencyController@convert')->name('calculate');
@@ -47,7 +47,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         require __DIR__ . '/announcement.php';
 
-//        require __DIR__ . '/wallet.php';
+        require __DIR__ . '/wallet.php';
+
 //        require __DIR__ . '/rate.php';
 //        require __DIR__ . '/receipt.php';
 
diff --git a/routes/wallet.php b/routes/wallet.php
index 6b19a47c..13288fb2 100644
--- a/routes/wallet.php
+++ b/routes/wallet.php
@@ -3,8 +3,9 @@
 use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'wallets', 'namespace' => 'Wallets', 'as' => 'wallet.'], function () {
-
+    Route::get('/', 'ListWalletController@list')->name('list');
     Route::post('/create', 'CreateWalletController@create')->name('create');
-    Route::post('/create-transaction/{id}', 'CreateWalletTransactionController@create')->name('create_transaction');
-
-});
\ No newline at end of file
+    Route::post('/topup', 'TopUpWalletController@topUp')->name('topup');
+    Route::post('/withdraw', 'WithdrawWalletController@withdraw')->name('withdraw');
+    Route::post('/update-status', 'UpdateStatusWalletController@updateStatus')->name('update.status');
+});