diff --git a/.gitignore b/.gitignore
index de84bee2..ac0eb695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,8 @@ public/.DS_Store
 public/images/.DS_Store
 gox.iml
 rebuild_docker.sh
+r.sh
 docker/*
 db/*
 docker-compose.yml
-package-lock.json
\ No newline at end of file
+package-lock.json
diff --git a/app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php
index c0b60806..b3bc375f 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php
@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
-
+use App\Classes\Modules\Unity\Processors\CreateEntityProcessor;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
 use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
@@ -15,15 +15,19 @@ use Illuminate\Http\Request;
 
 class CreateCompanyLogic extends AbstractControllerLogic
 {
+
+    private $createUnityEntityProcessor;
+
     /**
      * CreateCompanyLogic constructor.
      * @param CreateCompanyProcessor $createCompanyProcessor
      * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
      */
-    public function __construct(CreateCompanyProcessor $createCompanyProcessor ,CreateCompanyModuleProcessor $createCompanyModuleProcessor)
+    public function __construct(CreateCompanyProcessor $createCompanyProcessor ,CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateEntityProcessor $createUnityEntityProcessor)
     {
         $this->createCompanyProcessor = $createCompanyProcessor;
         $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
+        $this->createUnityEntityProcessor = $createUnityEntityProcessor;
     }
 
     /**
@@ -53,7 +57,10 @@ class CreateCompanyLogic extends AbstractControllerLogic
 
         $this->createCompanyModuleProcessor->execute($company , $request->input('business_type'));
 
+        //$unityEntity = $this->createUnityEntityProcessor->execute($company->name);
+        //TODO: Update company table with hash id
+
         return $this->resourceResponse(new CompanyResource($company));
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/OrderSteps/Processors/GenerateOrderStepsProcessor.php b/app/Classes/Modules/OrderSteps/Processors/GenerateOrderStepsProcessor.php
index 97789148..343c0ad0 100644
--- a/app/Classes/Modules/OrderSteps/Processors/GenerateOrderStepsProcessor.php
+++ b/app/Classes/Modules/OrderSteps/Processors/GenerateOrderStepsProcessor.php
@@ -27,24 +27,23 @@ class GenerateOrderStepsProcessor
 
     private $createsManyOrderStep;
 
-    private $unityConfig;
-
     private $updateOrderStepProcessors;
 
-    private $getContractObligationsProcessor;
+    private $getUnityContractObligationsProcessor;
 
-    public function __construct(UpdatesOrderCurrentStepProcessor $updatesOrderCurrentStep, CreatesManyOrderSteps $createsManyOrderStep, UpdateOrderStepsProcessor $updateOrderStepProcessors, GetContractObligationsProcessor $getContractObligationsProcessor)
+    public function __construct(UpdatesOrderCurrentStepProcessor $updatesOrderCurrentStep, CreatesManyOrderSteps $createsManyOrderStep, UpdateOrderStepsProcessor $updateOrderStepProcessors, GetContractObligationsProcessor $getUnityContractObligationsProcessor)
     {
         $this->updatesOrderCurrentStep = $updatesOrderCurrentStep;
-        $this->unityConfig = Config::get('unity');
         $this->createsManyOrderStep = $createsManyOrderStep;
         $this->updateOrderStepProcessors = $updateOrderStepProcessors;
-        $this->getContractObligationsProcessor = $getContractObligationsProcessor;
+        $this->getUnityContractObligationsProcessor = $getUnityContractObligationsProcessor;
     }
 
     public function execute(Order $order){
 
-        $obligations = $this->getContractObligationsProcessor->execute();
+        $obligations = $this->getUnityContractObligationsProcessor->execute();
+
+        //TODO: Update Appointee ID to Entity User base on hash key
 
         foreach($obligations as $step){
             $orderSteps[] = new OrderStepsObject(
diff --git a/app/Classes/Modules/Remarks/ControllersLogic/CreateRemarkLogic.php b/app/Classes/Modules/Remarks/ControllersLogic/CreateRemarkLogic.php
new file mode 100644
index 00000000..4eb7665e
--- /dev/null
+++ b/app/Classes/Modules/Remarks/ControllersLogic/CreateRemarkLogic.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Remarks\Services\CreatesRemark;
+use App\Classes\Modules\Remarks\Services\FetchesDistrict;
+use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Http\Resources\RemarkResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateRemarkLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Remark',
+            'message' => 'You have successfully created a new Remark'
+        ];
+    }
+
+    /** @var CanCreateRemark */
+    private $canCreateRemark;
+
+    /** @var FetchesDistrict */
+    private $fetchesDistrict;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CreatesRemark */
+    private $createsRemark;
+
+    /**
+     * CreateRemarkLogic constructor.
+     * @param CanCreateRemark $canCreateRemark
+     * @param FetchesDistrict $fetchesDistrict
+     * @param FetchesCompany $fetchesCompany
+     * @param CreatesRemark $createsRemark
+     */
+    public function __construct(CanCreateRemark $canCreateRemark, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesRemark $createsRemark)
+    {
+        $this->canCreateRemark = $canCreateRemark;
+        $this->fetchesDistrict = $fetchesDistrict;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->createsRemark = $createsRemark;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
+
+        $object = new RemarkObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+
+        $this->canCreateRemark->passes($object);
+
+        $query = $this->createsRemark->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
+
+        return $this->resourceResponse(new RemarkResource($query));
+
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/ControllersLogic/DeleteRemarkLogic.php b/app/Classes/Modules/Remarks/ControllersLogic/DeleteRemarkLogic.php
new file mode 100644
index 00000000..f731cca5
--- /dev/null
+++ b/app/Classes/Modules/Remarks/ControllersLogic/DeleteRemarkLogic.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Remarks\Services\DeletesRemark;
+use App\Classes\Modules\Remarks\Services\FetchesRemark;
+use App\Classes\Modules\Remarks\Standards\Rules\CanDeleteRemark;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteRemarkLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Deleted Remark',
+            'message' => 'You have successfully deleted a Remark'
+        ];
+    }
+
+
+    /** @var CanDeleteRemark */
+    private $canDeleteRemark;
+
+    /** @var DeletesRemark */
+    private $deletesRemark;
+
+    /** @var FetchesRemark */
+        private $fetchesRemark;
+
+    /**
+     * DeleteRemarkControllersLogic constructor.
+     * @param CanDeleteRemark $canDeleteRemark
+     * @param DeletesRemark $deletesRemark
+     * @param FetchesRemark $fetchesRemark
+     */
+    public function __construct(CanDeleteRemark $canDeleteRemark, DeletesRemark $deletesRemark, FetchesRemark $fetchesRemark)
+    {
+        $this->canDeleteRemark = $canDeleteRemark;
+        $this->deletesRemark = $deletesRemark;
+        $this->fetchesRemark = $fetchesRemark;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canDeleteRemark->passes();
+
+            $query = $this->fetchesRemark->execute(['id' => $request->route('id')]);
+
+            $this->deletesRemark->execute($query);
+
+            return $this->response([]);
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/ControllersLogic/FetchRemarkLogic.php b/app/Classes/Modules/Remarks/ControllersLogic/FetchRemarkLogic.php
new file mode 100644
index 00000000..3ff151d3
--- /dev/null
+++ b/app/Classes/Modules/Remarks/ControllersLogic/FetchRemarkLogic.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Remarks\Services\FetchesRemark;
+use App\Classes\Modules\Remarks\Standards\Rules\CanFetchRemark;
+use App\Http\Resources\RemarkResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchRemarkLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Remark',
+            'message' => 'You have successfully retrieved a Remark'
+        ];
+    }
+
+    /** @var CanFetchRemark */
+    private $canFetchRemark;
+
+    /** @var FetchesRemark */
+    private $fetchesRemark;
+
+    /**
+     * FetchRemarkControllersLogic constructor.
+     * @param CanFetchRemark $canFetchRemark
+     * @param FetchesRemark $fetchesRemark
+     */
+    public function __construct(CanFetchRemark $canFetchRemark, FetchesRemark $fetchesRemark)
+    {
+        $this->canFetchRemark = $canFetchRemark;
+        $this->fetchesRemark = $fetchesRemark;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canFetchRemark->passes();
+
+            $query = $this->fetchesRemark->execute(['id' => $request->route('id')]);
+
+            return $this->resourceResponse(new RemarkResource($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/ControllersLogic/ListRemarksLogic.php b/app/Classes/Modules/Remarks/ControllersLogic/ListRemarksLogic.php
new file mode 100644
index 00000000..a7d7ff43
--- /dev/null
+++ b/app/Classes/Modules/Remarks/ControllersLogic/ListRemarksLogic.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Remarks\Services\ListsRemarks;
+use App\Classes\Modules\Remarks\Standards\Rules\CanListRemarks;
+use App\Http\Resources\RemarkResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListRemarksLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Remarks',
+            'message' => 'You have successfully retrieved a list of Remarks'
+        ];
+    }
+
+    /** @var CanListRemarks */
+    private $canListRemarks;
+
+    /** @var ListsRemarks */
+    private $listsRemarks;
+
+    /**
+     * ListRemarksLogic constructor.
+     * @param CanListRemarks $canListRemarks
+     * @param ListsRemarks $listsRemarks
+     */
+    public function __construct(CanListRemarks $canListRemarks, ListsRemarks $listsRemarks)
+    {
+        $this->canListRemarks = $canListRemarks;
+        $this->listsRemarks = $listsRemarks;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canListRemarks->passes();
+
+            $query = $this->listsRemarks->execute($this->listsRemarks->deserializeFilters($request->input('filters')));
+
+            return $this->collectionResponse(RemarkResource::collection($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php b/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php
new file mode 100644
index 00000000..020906eb
--- /dev/null
+++ b/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Remarks\Services\UpdatesRemark;
+use App\Classes\Modules\Remarks\Services\FetchesRemark;
+use App\Classes\Modules\Remarks\Services\FetchesDistrict;
+use App\Classes\Modules\Remarks\Standards\Rules\CanUpdateRemark;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Http\Resources\RemarkResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateRemarkLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Remark',
+            'message' => 'You have successfully updated the Remark'
+        ];
+    }
+
+    /** @var CanUpdateRemark */
+    private $canUpdateRemark;
+
+    /** @var UpdatesRemark */
+    private $updatesRemark;
+
+    /** @var FetchesRemark */
+    private $fetchesRemark;
+
+    /** @var FetchesDistrict */
+    private $fetchesDistrict;
+
+    /**
+     * UpdateRemarkLogic constructor.
+     * @param CanUpdateRemark $canUpdateRemark
+     * @param UpdatesRemark $updatesRemark
+     * @param FetchesRemark $fetchesRemark
+     * @param FetchesDistrict $fetchesDistrict
+     */
+    public function __construct(CanUpdateRemark $canUpdateRemark, UpdatesRemark $updatesRemark, FetchesRemark $fetchesRemark, FetchesDistrict $fetchesDistrict)
+    {
+        $this->canUpdateRemark = $canUpdateRemark;
+        $this->updatesRemark = $updatesRemark;
+        $this->fetchesRemark = $fetchesRemark;
+        $this->fetchesDistrict = $fetchesDistrict;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
+            $object = new RemarkObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+            //$object = new RemarkObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+
+            $this->canUpdateRemark->passes($object);
+
+            $query = $this->fetchesRemark->execute(['id' => $request->route('id')]);
+
+            $query = $this->updatesRemark->execute($query, $object);
+
+            return $this->resourceResponse(new RemarkResource($query));
+
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/DataTransferObjects/RemarkObject.php b/app/Classes/Modules/Remarks/DataTransferObjects/RemarkObject.php
new file mode 100644
index 00000000..67beaa30
--- /dev/null
+++ b/app/Classes/Modules/Remarks/DataTransferObjects/RemarkObject.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class RemarkObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $streetOne;
+
+    /** @var string|null */
+    private $streetTwo;
+
+    /** @var int */
+    private $countryId;
+
+    /** @var int */
+    private $stateId;
+
+    /** @var int */
+    private $districtId;
+
+    /** @var int */
+    private $postCode;
+
+    /**
+     * RemarkObject constructor.
+     * @param string $streetOne
+     * @param null|string $streetTwo
+     * @param int $countryId
+     * @param int $stateId
+     * @param int $districtId
+     * @param int $postCode
+     */
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode)
+    {
+        $this->streetOne = $streetOne;
+        $this->streetTwo = $streetTwo;
+        $this->countryId = $countryId;
+        $this->stateId = $stateId;
+        $this->districtId = $districtId;
+        $this->postCode = $postCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStreetOne(): string
+    {
+        return $this->streetOne;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getStreetTwo(): ?string
+    {
+        return $this->streetTwo;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCountryId(): int
+    {
+        return $this->countryId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStateId(): int
+    {
+        return $this->stateId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getDistrictId(): int
+    {
+        return $this->districtId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPostCode(): int
+    {
+        return $this->postCode;
+    }
+
+
+}
diff --git a/app/Classes/Modules/Remarks/Services/CreatesRemark.php b/app/Classes/Modules/Remarks/Services/CreatesRemark.php
new file mode 100644
index 00000000..c4067869
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Services/CreatesRemark.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Models\Remark;
+use App\Models\Company;
+
+class CreatesRemark extends AbstractUpdateRelationshipRecord
+{
+
+    /**
+     * @param Company $company
+     * @param RemarkObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $company, RemarkObject $object) {
+        $model = new Remark();
+        $model->street_one = $object->getStreetOne();
+        $model->street_two = $object->getStreetTwo();
+        $model->country_id = $object->getCountryId();
+        $model->state_id = $object->getStateId();
+        $model->district_id = $object->getDistrictId();
+        $model->postcode = $object->getPostCode();
+
+        return $this->handler($company->Remarks(), $model);
+
+    }
+}
diff --git a/app/Classes/Modules/Remarks/Services/DeletesRemark.php b/app/Classes/Modules/Remarks/Services/DeletesRemark.php
new file mode 100644
index 00000000..4c29be9d
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Services/DeletesRemark.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Remark;
+
+class DeletesRemark extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Remark $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Remark $model) {
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Remarks/Services/FetchesRemark.php b/app/Classes/Modules/Remarks/Services/FetchesRemark.php
new file mode 100644
index 00000000..a3b5c765
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Services/FetchesRemark.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Remark;
+
+class FetchesRemark extends AbstractFetchRecord
+{
+
+    /** @var Remark */
+    private $repository;
+
+    /**
+     * FetchesRemark constructor.
+     * @param Remark $repository
+     */
+    public function __construct(Remark $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Remarks/Services/ListsRemarks.php b/app/Classes/Modules/Remarks/Services/ListsRemarks.php
new file mode 100644
index 00000000..53479558
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Services/ListsRemarks.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Remark;
+
+class ListsRemarks extends AbstractListRecord
+{
+
+    /** @var Remark */
+    private $repository;
+
+    /**
+     * ListsRemarks constructor.
+     * @param Remark $repository
+     */
+    public function __construct(Remark $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Remarks/Services/UpdatesRemark.php b/app/Classes/Modules/Remarks/Services/UpdatesRemark.php
new file mode 100644
index 00000000..082e2281
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Services/UpdatesRemark.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Models\Remark;
+
+class UpdatesRemark extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Remark $model
+     * @param RemarkObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Remark $model, RemarkObject $object) {
+
+        //$model->company_id = $object->getCompanyId();
+        $model->street_one = $object->getStreetOne();
+        $model->street_two = $object->getStreetTwo();
+        $model->district_id = $object->getDistrictId();
+        $model->state_id = $object->getStateId();
+        $model->postcode = $object->getPostCode();
+        $model->country_id = $object->getCountryId();
+        //$model->default = $object->getDefault();
+        //$model->billing = $object->getBilling();
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Classes/Modules/Remarks/Standards/Rules/CanCreateRemark.php b/app/Classes/Modules/Remarks/Standards/Rules/CanCreateRemark.php
new file mode 100644
index 00000000..fc51178f
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Standards/Rules/CanCreateRemark.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Standards\Validators\RemarkValidation;
+
+class CanCreateRemark extends AbstractRule
+{
+
+    /** @var RemarkValidation */
+    private $RemarkValidation;
+
+    /**
+     * CanCreateRemark constructor.
+     * @param RemarkValidation $RemarkValidation
+     */
+    public function __construct(RemarkValidation $RemarkValidation)
+    {
+        $this->RemarkValidation = $RemarkValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param RemarkObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->RemarkValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param RemarkObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/Standards/Rules/CanDeleteRemark.php b/app/Classes/Modules/Remarks/Standards/Rules/CanDeleteRemark.php
new file mode 100644
index 00000000..7ddece31
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Standards/Rules/CanDeleteRemark.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+
+class CanDeleteRemark extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param RemarkObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param RemarkObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/Standards/Rules/CanFetchRemark.php b/app/Classes/Modules/Remarks/Standards/Rules/CanFetchRemark.php
new file mode 100644
index 00000000..6642611c
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Standards/Rules/CanFetchRemark.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+
+class CanFetchRemark extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param RemarkObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param RemarkObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/Standards/Rules/CanListRemarks.php b/app/Classes/Modules/Remarks/Standards/Rules/CanListRemarks.php
new file mode 100644
index 00000000..4911a53b
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Standards/Rules/CanListRemarks.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+
+class CanListRemarks extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param RemarkObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param RemarkObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/Standards/Rules/CanUpdateRemark.php b/app/Classes/Modules/Remarks/Standards/Rules/CanUpdateRemark.php
new file mode 100644
index 00000000..8a8c10e8
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Standards/Rules/CanUpdateRemark.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Standards\Validators\RemarkValidation;
+
+class CanUpdateRemark extends AbstractRule
+{
+
+    /** @var RemarkValidation */
+    private $RemarkValidation;
+
+    /**
+     * CanUpdateRemark constructor.
+     * @param RemarkValidation $RemarkValidation
+     */
+    public function __construct(RemarkValidation $RemarkValidation)
+    {
+        $this->RemarkValidation = $RemarkValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param RemarkObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->RemarkValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param RemarkObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/Standards/Validators/RemarkValidation.php b/app/Classes/Modules/Remarks/Standards/Validators/RemarkValidation.php
new file mode 100644
index 00000000..25c9dfee
--- /dev/null
+++ b/app/Classes/Modules/Remarks/Standards/Validators/RemarkValidation.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Modules\Remarks\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+
+class RemarkValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param RemarkObject $object
+     * @return array
+     */
+    protected function data($object): array {
+        return [
+            'street_one' => $object->getStreetOne(),
+            'street_two' => $object->getStreetTwo(),
+            'district_id' => $object->getDistrictId()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'street_one' => 'required',
+            'district_id' => 'required',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php b/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php
new file mode 100644
index 00000000..06ca06a8
--- /dev/null
+++ b/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\Schedules\Services\FetchesDistrict;
+use App\Classes\Modules\Schedules\Standards\Rules\CanCreateSchedule;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Http\Resources\ScheduleResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateScheduleLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Schedule',
+            'message' => 'You have successfully created a new Schedule'
+        ];
+    }
+
+    /** @var CanCreateSchedule */
+    private $canCreateSchedule;
+
+    /** @var FetchesDistrict */
+    private $fetchesDistrict;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    /**
+     * CreateScheduleLogic constructor.
+     * @param CanCreateSchedule $canCreateSchedule
+     * @param FetchesDistrict $fetchesDistrict
+     * @param FetchesCompany $fetchesCompany
+     * @param CreatesSchedule $createsSchedule
+     */
+    public function __construct(CanCreateSchedule $canCreateSchedule, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesSchedule $createsSchedule)
+    {
+        $this->canCreateSchedule = $canCreateSchedule;
+        $this->fetchesDistrict = $fetchesDistrict;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->createsSchedule = $createsSchedule;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
+
+        $object = new ScheduleObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+
+        $this->canCreateSchedule->passes($object);
+
+        $query = $this->createsSchedule->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
+
+        return $this->resourceResponse(new ScheduleResource($query));
+
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/ControllersLogic/DeleteScheduleLogic.php b/app/Classes/Modules/Schedules/ControllersLogic/DeleteScheduleLogic.php
new file mode 100644
index 00000000..2d0f62e7
--- /dev/null
+++ b/app/Classes/Modules/Schedules/ControllersLogic/DeleteScheduleLogic.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Schedules\Services\DeletesSchedule;
+use App\Classes\Modules\Schedules\Services\FetchesSchedule;
+use App\Classes\Modules\Schedules\Standards\Rules\CanDeleteSchedule;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteScheduleLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Deleted Schedule',
+            'message' => 'You have successfully deleted a Schedule'
+        ];
+    }
+
+
+    /** @var CanDeleteSchedule */
+    private $canDeleteSchedule;
+
+    /** @var DeletesSchedule */
+    private $deletesSchedule;
+
+    /** @var FetchesSchedule */
+        private $fetchesSchedule;
+
+    /**
+     * DeleteScheduleControllersLogic constructor.
+     * @param CanDeleteSchedule $canDeleteSchedule
+     * @param DeletesSchedule $deletesSchedule
+     * @param FetchesSchedule $fetchesSchedule
+     */
+    public function __construct(CanDeleteSchedule $canDeleteSchedule, DeletesSchedule $deletesSchedule, FetchesSchedule $fetchesSchedule)
+    {
+        $this->canDeleteSchedule = $canDeleteSchedule;
+        $this->deletesSchedule = $deletesSchedule;
+        $this->fetchesSchedule = $fetchesSchedule;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canDeleteSchedule->passes();
+
+            $query = $this->fetchesSchedule->execute(['id' => $request->route('id')]);
+
+            $this->deletesSchedule->execute($query);
+
+            return $this->response([]);
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/ControllersLogic/FetchScheduleLogic.php b/app/Classes/Modules/Schedules/ControllersLogic/FetchScheduleLogic.php
new file mode 100644
index 00000000..2c36a0d1
--- /dev/null
+++ b/app/Classes/Modules/Schedules/ControllersLogic/FetchScheduleLogic.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Schedules\Services\FetchesSchedule;
+use App\Classes\Modules\Schedules\Standards\Rules\CanFetchSchedule;
+use App\Http\Resources\ScheduleResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchScheduleLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Schedule',
+            'message' => 'You have successfully retrieved a Schedule'
+        ];
+    }
+
+    /** @var CanFetchSchedule */
+    private $canFetchSchedule;
+
+    /** @var FetchesSchedule */
+    private $fetchesSchedule;
+
+    /**
+     * FetchScheduleControllersLogic constructor.
+     * @param CanFetchSchedule $canFetchSchedule
+     * @param FetchesSchedule $fetchesSchedule
+     */
+    public function __construct(CanFetchSchedule $canFetchSchedule, FetchesSchedule $fetchesSchedule)
+    {
+        $this->canFetchSchedule = $canFetchSchedule;
+        $this->fetchesSchedule = $fetchesSchedule;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canFetchSchedule->passes();
+
+            $query = $this->fetchesSchedule->execute(['id' => $request->route('id')]);
+
+            return $this->resourceResponse(new ScheduleResource($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/ControllersLogic/ListSchedulesLogic.php b/app/Classes/Modules/Schedules/ControllersLogic/ListSchedulesLogic.php
new file mode 100644
index 00000000..17f4dee8
--- /dev/null
+++ b/app/Classes/Modules/Schedules/ControllersLogic/ListSchedulesLogic.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Schedules\Services\ListsSchedules;
+use App\Classes\Modules\Schedules\Standards\Rules\CanListSchedules;
+use App\Http\Resources\ScheduleResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListSchedulesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Schedules',
+            'message' => 'You have successfully retrieved a list of Schedules'
+        ];
+    }
+
+    /** @var CanListSchedules */
+    private $canListSchedules;
+
+    /** @var ListsSchedules */
+    private $listsSchedules;
+
+    /**
+     * ListSchedulesLogic constructor.
+     * @param CanListSchedules $canListSchedules
+     * @param ListsSchedules $listsSchedules
+     */
+    public function __construct(CanListSchedules $canListSchedules, ListsSchedules $listsSchedules)
+    {
+        $this->canListSchedules = $canListSchedules;
+        $this->listsSchedules = $listsSchedules;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canListSchedules->passes();
+
+            $query = $this->listsSchedules->execute($this->listsSchedules->deserializeFilters($request->input('filters')));
+
+            return $this->collectionResponse(ScheduleResource::collection($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/ControllersLogic/UpdateScheduleLogic.php b/app/Classes/Modules/Schedules/ControllersLogic/UpdateScheduleLogic.php
new file mode 100644
index 00000000..b8589cf6
--- /dev/null
+++ b/app/Classes/Modules/Schedules/ControllersLogic/UpdateScheduleLogic.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Schedules\Services\UpdatesSchedule;
+use App\Classes\Modules\Schedules\Services\FetchesSchedule;
+use App\Classes\Modules\Schedules\Services\FetchesDistrict;
+use App\Classes\Modules\Schedules\Standards\Rules\CanUpdateSchedule;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Http\Resources\ScheduleResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateScheduleLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Schedule',
+            'message' => 'You have successfully updated the Schedule'
+        ];
+    }
+
+    /** @var CanUpdateSchedule */
+    private $canUpdateSchedule;
+
+    /** @var UpdatesSchedule */
+    private $updatesSchedule;
+
+    /** @var FetchesSchedule */
+    private $fetchesSchedule;
+
+    /** @var FetchesDistrict */
+    private $fetchesDistrict;
+
+    /**
+     * UpdateScheduleLogic constructor.
+     * @param CanUpdateSchedule $canUpdateSchedule
+     * @param UpdatesSchedule $updatesSchedule
+     * @param FetchesSchedule $fetchesSchedule
+     * @param FetchesDistrict $fetchesDistrict
+     */
+    public function __construct(CanUpdateSchedule $canUpdateSchedule, UpdatesSchedule $updatesSchedule, FetchesSchedule $fetchesSchedule, FetchesDistrict $fetchesDistrict)
+    {
+        $this->canUpdateSchedule = $canUpdateSchedule;
+        $this->updatesSchedule = $updatesSchedule;
+        $this->fetchesSchedule = $fetchesSchedule;
+        $this->fetchesDistrict = $fetchesDistrict;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
+            $object = new ScheduleObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+            //$object = new ScheduleObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+
+            $this->canUpdateSchedule->passes($object);
+
+            $query = $this->fetchesSchedule->execute(['id' => $request->route('id')]);
+
+            $query = $this->updatesSchedule->execute($query, $object);
+
+            return $this->resourceResponse(new ScheduleResource($query));
+
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/DataTransferObjects/ScheduleObject.php b/app/Classes/Modules/Schedules/DataTransferObjects/ScheduleObject.php
new file mode 100644
index 00000000..9a85301d
--- /dev/null
+++ b/app/Classes/Modules/Schedules/DataTransferObjects/ScheduleObject.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ScheduleObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $streetOne;
+
+    /** @var string|null */
+    private $streetTwo;
+
+    /** @var int */
+    private $countryId;
+
+    /** @var int */
+    private $stateId;
+
+    /** @var int */
+    private $districtId;
+
+    /** @var int */
+    private $postCode;
+
+    /**
+     * ScheduleObject constructor.
+     * @param string $streetOne
+     * @param null|string $streetTwo
+     * @param int $countryId
+     * @param int $stateId
+     * @param int $districtId
+     * @param int $postCode
+     */
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode)
+    {
+        $this->streetOne = $streetOne;
+        $this->streetTwo = $streetTwo;
+        $this->countryId = $countryId;
+        $this->stateId = $stateId;
+        $this->districtId = $districtId;
+        $this->postCode = $postCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStreetOne(): string
+    {
+        return $this->streetOne;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getStreetTwo(): ?string
+    {
+        return $this->streetTwo;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCountryId(): int
+    {
+        return $this->countryId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStateId(): int
+    {
+        return $this->stateId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getDistrictId(): int
+    {
+        return $this->districtId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPostCode(): int
+    {
+        return $this->postCode;
+    }
+
+
+}
diff --git a/app/Classes/Modules/Schedules/Services/CreatesSchedule.php b/app/Classes/Modules/Schedules/Services/CreatesSchedule.php
new file mode 100644
index 00000000..2cb67a6f
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Services/CreatesSchedule.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Models\Schedule;
+use App\Models\Company;
+
+class CreatesSchedule extends AbstractUpdateRelationshipRecord
+{
+
+    /**
+     * @param Company $company
+     * @param ScheduleObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $company, ScheduleObject $object) {
+        $model = new Schedule();
+        $model->street_one = $object->getStreetOne();
+        $model->street_two = $object->getStreetTwo();
+        $model->country_id = $object->getCountryId();
+        $model->state_id = $object->getStateId();
+        $model->district_id = $object->getDistrictId();
+        $model->postcode = $object->getPostCode();
+
+        return $this->handler($company->Schedules(), $model);
+
+    }
+}
diff --git a/app/Classes/Modules/Schedules/Services/DeletesSchedule.php b/app/Classes/Modules/Schedules/Services/DeletesSchedule.php
new file mode 100644
index 00000000..cd1368cf
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Services/DeletesSchedule.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Schedule;
+
+class DeletesSchedule extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Schedule $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Schedule $model) {
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Schedules/Services/FetchesSchedule.php b/app/Classes/Modules/Schedules/Services/FetchesSchedule.php
new file mode 100644
index 00000000..eb7e4311
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Services/FetchesSchedule.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Schedule;
+
+class FetchesSchedule extends AbstractFetchRecord
+{
+
+    /** @var Schedule */
+    private $repository;
+
+    /**
+     * FetchesSchedule constructor.
+     * @param Schedule $repository
+     */
+    public function __construct(Schedule $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Schedules/Services/ListsSchedules.php b/app/Classes/Modules/Schedules/Services/ListsSchedules.php
new file mode 100644
index 00000000..aeacc9e3
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Services/ListsSchedules.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Schedule;
+
+class ListsSchedules extends AbstractListRecord
+{
+
+    /** @var Schedule */
+    private $repository;
+
+    /**
+     * ListsSchedules constructor.
+     * @param Schedule $repository
+     */
+    public function __construct(Schedule $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Schedules/Services/UpdatesSchedule.php b/app/Classes/Modules/Schedules/Services/UpdatesSchedule.php
new file mode 100644
index 00000000..84e9491c
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Services/UpdatesSchedule.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Models\Schedule;
+
+class UpdatesSchedule extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Schedule $model
+     * @param ScheduleObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Schedule $model, ScheduleObject $object) {
+
+        //$model->company_id = $object->getCompanyId();
+        $model->street_one = $object->getStreetOne();
+        $model->street_two = $object->getStreetTwo();
+        $model->district_id = $object->getDistrictId();
+        $model->state_id = $object->getStateId();
+        $model->postcode = $object->getPostCode();
+        $model->country_id = $object->getCountryId();
+        //$model->default = $object->getDefault();
+        //$model->billing = $object->getBilling();
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Classes/Modules/Schedules/Standards/Rules/CanCreateSchedule.php b/app/Classes/Modules/Schedules/Standards/Rules/CanCreateSchedule.php
new file mode 100644
index 00000000..38dadf18
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Standards/Rules/CanCreateSchedule.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\Schedules\Standards\Validators\ScheduleValidation;
+
+class CanCreateSchedule extends AbstractRule
+{
+
+    /** @var ScheduleValidation */
+    private $ScheduleValidation;
+
+    /**
+     * CanCreateSchedule constructor.
+     * @param ScheduleValidation $ScheduleValidation
+     */
+    public function __construct(ScheduleValidation $ScheduleValidation)
+    {
+        $this->ScheduleValidation = $ScheduleValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ScheduleObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->ScheduleValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param ScheduleObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/Standards/Rules/CanDeleteSchedule.php b/app/Classes/Modules/Schedules/Standards/Rules/CanDeleteSchedule.php
new file mode 100644
index 00000000..31b5fb08
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Standards/Rules/CanDeleteSchedule.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+
+class CanDeleteSchedule extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ScheduleObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ScheduleObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/Standards/Rules/CanFetchSchedule.php b/app/Classes/Modules/Schedules/Standards/Rules/CanFetchSchedule.php
new file mode 100644
index 00000000..4bffce34
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Standards/Rules/CanFetchSchedule.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+
+class CanFetchSchedule extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ScheduleObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ScheduleObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/Standards/Rules/CanListSchedules.php b/app/Classes/Modules/Schedules/Standards/Rules/CanListSchedules.php
new file mode 100644
index 00000000..b837a71e
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Standards/Rules/CanListSchedules.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+
+class CanListSchedules extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ScheduleObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ScheduleObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/Standards/Rules/CanUpdateSchedule.php b/app/Classes/Modules/Schedules/Standards/Rules/CanUpdateSchedule.php
new file mode 100644
index 00000000..53cb24a2
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Standards/Rules/CanUpdateSchedule.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\Schedules\Standards\Validators\ScheduleValidation;
+
+class CanUpdateSchedule extends AbstractRule
+{
+
+    /** @var ScheduleValidation */
+    private $ScheduleValidation;
+
+    /**
+     * CanUpdateSchedule constructor.
+     * @param ScheduleValidation $ScheduleValidation
+     */
+    public function __construct(ScheduleValidation $ScheduleValidation)
+    {
+        $this->ScheduleValidation = $ScheduleValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ScheduleObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->ScheduleValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param ScheduleObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php b/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php
new file mode 100644
index 00000000..4039e0ee
--- /dev/null
+++ b/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Modules\Schedules\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+
+class ScheduleValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param ScheduleObject $object
+     * @return array
+     */
+    protected function data($object): array {
+        return [
+            'street_one' => $object->getStreetOne(),
+            'street_two' => $object->getStreetTwo(),
+            'district_id' => $object->getDistrictId()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'street_one' => 'required',
+            'district_id' => 'required',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php b/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
new file mode 100644
index 00000000..b3e8d554
--- /dev/null
+++ b/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Classes\Modules\Transports\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\Transports\Services\FetchesDistrict;
+use App\Classes\Modules\Transports\Standards\Rules\CanCreateTransport;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Http\Resources\TransportResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateTransportLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Transport',
+            'message' => 'You have successfully created a new Transport'
+        ];
+    }
+
+    /** @var CanCreateTransport */
+    private $canCreateTransport;
+
+    /** @var FetchesDistrict */
+    private $fetchesDistrict;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /**
+     * CreateTransportLogic constructor.
+     * @param CanCreateTransport $canCreateTransport
+     * @param FetchesDistrict $fetchesDistrict
+     * @param FetchesCompany $fetchesCompany
+     * @param CreatesTransport $createsTransport
+     */
+    public function __construct(CanCreateTransport $canCreateTransport, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesTransport $createsTransport)
+    {
+        $this->canCreateTransport = $canCreateTransport;
+        $this->fetchesDistrict = $fetchesDistrict;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->createsTransport = $createsTransport;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
+
+        $object = new TransportObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+
+        $this->canCreateTransport->passes($object);
+
+        $query = $this->createsTransport->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
+
+        return $this->resourceResponse(new TransportResource($query));
+
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/ControllersLogic/DeleteTransportLogic.php b/app/Classes/Modules/Transports/ControllersLogic/DeleteTransportLogic.php
new file mode 100644
index 00000000..c21afd27
--- /dev/null
+++ b/app/Classes/Modules/Transports/ControllersLogic/DeleteTransportLogic.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\Transports\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transports\Services\DeletesTransport;
+use App\Classes\Modules\Transports\Services\FetchesTransport;
+use App\Classes\Modules\Transports\Standards\Rules\CanDeleteTransport;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteTransportLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Deleted Transport',
+            'message' => 'You have successfully deleted a Transport'
+        ];
+    }
+
+
+    /** @var CanDeleteTransport */
+    private $canDeleteTransport;
+
+    /** @var DeletesTransport */
+    private $deletesTransport;
+
+    /** @var FetchesTransport */
+        private $fetchesTransport;
+
+    /**
+     * DeleteTransportControllersLogic constructor.
+     * @param CanDeleteTransport $canDeleteTransport
+     * @param DeletesTransport $deletesTransport
+     * @param FetchesTransport $fetchesTransport
+     */
+    public function __construct(CanDeleteTransport $canDeleteTransport, DeletesTransport $deletesTransport, FetchesTransport $fetchesTransport)
+    {
+        $this->canDeleteTransport = $canDeleteTransport;
+        $this->deletesTransport = $deletesTransport;
+        $this->fetchesTransport = $fetchesTransport;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canDeleteTransport->passes();
+
+            $query = $this->fetchesTransport->execute(['id' => $request->route('id')]);
+
+            $this->deletesTransport->execute($query);
+
+            return $this->response([]);
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/ControllersLogic/FetchTransportLogic.php b/app/Classes/Modules/Transports/ControllersLogic/FetchTransportLogic.php
new file mode 100644
index 00000000..ed624581
--- /dev/null
+++ b/app/Classes/Modules/Transports/ControllersLogic/FetchTransportLogic.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Transports\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transports\Services\FetchesTransport;
+use App\Classes\Modules\Transports\Standards\Rules\CanFetchTransport;
+use App\Http\Resources\TransportResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchTransportLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Transport',
+            'message' => 'You have successfully retrieved a Transport'
+        ];
+    }
+
+    /** @var CanFetchTransport */
+    private $canFetchTransport;
+
+    /** @var FetchesTransport */
+    private $fetchesTransport;
+
+    /**
+     * FetchTransportControllersLogic constructor.
+     * @param CanFetchTransport $canFetchTransport
+     * @param FetchesTransport $fetchesTransport
+     */
+    public function __construct(CanFetchTransport $canFetchTransport, FetchesTransport $fetchesTransport)
+    {
+        $this->canFetchTransport = $canFetchTransport;
+        $this->fetchesTransport = $fetchesTransport;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canFetchTransport->passes();
+
+            $query = $this->fetchesTransport->execute(['id' => $request->route('id')]);
+
+            return $this->resourceResponse(new TransportResource($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/ControllersLogic/ListTransportsLogic.php b/app/Classes/Modules/Transports/ControllersLogic/ListTransportsLogic.php
new file mode 100644
index 00000000..2d5d1bc5
--- /dev/null
+++ b/app/Classes/Modules/Transports/ControllersLogic/ListTransportsLogic.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Transports\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transports\Services\ListsTransports;
+use App\Classes\Modules\Transports\Standards\Rules\CanListTransports;
+use App\Http\Resources\TransportResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListTransportsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Transports',
+            'message' => 'You have successfully retrieved a list of Transports'
+        ];
+    }
+
+    /** @var CanListTransports */
+    private $canListTransports;
+
+    /** @var ListsTransports */
+    private $listsTransports;
+
+    /**
+     * ListTransportsLogic constructor.
+     * @param CanListTransports $canListTransports
+     * @param ListsTransports $listsTransports
+     */
+    public function __construct(CanListTransports $canListTransports, ListsTransports $listsTransports)
+    {
+        $this->canListTransports = $canListTransports;
+        $this->listsTransports = $listsTransports;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canListTransports->passes();
+
+            $query = $this->listsTransports->execute($this->listsTransports->deserializeFilters($request->input('filters')));
+
+            return $this->collectionResponse(TransportResource::collection($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php b/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php
new file mode 100644
index 00000000..b6925003
--- /dev/null
+++ b/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Transports\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transports\Services\UpdatesTransport;
+use App\Classes\Modules\Transports\Services\FetchesTransport;
+use App\Classes\Modules\Transports\Services\FetchesDistrict;
+use App\Classes\Modules\Transports\Standards\Rules\CanUpdateTransport;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Http\Resources\TransportResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateTransportLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Transport',
+            'message' => 'You have successfully updated the Transport'
+        ];
+    }
+
+    /** @var CanUpdateTransport */
+    private $canUpdateTransport;
+
+    /** @var UpdatesTransport */
+    private $updatesTransport;
+
+    /** @var FetchesTransport */
+    private $fetchesTransport;
+
+    /** @var FetchesDistrict */
+    private $fetchesDistrict;
+
+    /**
+     * UpdateTransportLogic constructor.
+     * @param CanUpdateTransport $canUpdateTransport
+     * @param UpdatesTransport $updatesTransport
+     * @param FetchesTransport $fetchesTransport
+     * @param FetchesDistrict $fetchesDistrict
+     */
+    public function __construct(CanUpdateTransport $canUpdateTransport, UpdatesTransport $updatesTransport, FetchesTransport $fetchesTransport, FetchesDistrict $fetchesDistrict)
+    {
+        $this->canUpdateTransport = $canUpdateTransport;
+        $this->updatesTransport = $updatesTransport;
+        $this->fetchesTransport = $fetchesTransport;
+        $this->fetchesDistrict = $fetchesDistrict;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
+            $object = new TransportObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+            //$object = new TransportObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+
+            $this->canUpdateTransport->passes($object);
+
+            $query = $this->fetchesTransport->execute(['id' => $request->route('id')]);
+
+            $query = $this->updatesTransport->execute($query, $object);
+
+            return $this->resourceResponse(new TransportResource($query));
+
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/DataTransferObjects/TransportObject.php b/app/Classes/Modules/Transports/DataTransferObjects/TransportObject.php
new file mode 100644
index 00000000..9b90b930
--- /dev/null
+++ b/app/Classes/Modules/Transports/DataTransferObjects/TransportObject.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Classes\Modules\Transports\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class TransportObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $streetOne;
+
+    /** @var string|null */
+    private $streetTwo;
+
+    /** @var int */
+    private $countryId;
+
+    /** @var int */
+    private $stateId;
+
+    /** @var int */
+    private $districtId;
+
+    /** @var int */
+    private $postCode;
+
+    /**
+     * TransportObject constructor.
+     * @param string $streetOne
+     * @param null|string $streetTwo
+     * @param int $countryId
+     * @param int $stateId
+     * @param int $districtId
+     * @param int $postCode
+     */
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode)
+    {
+        $this->streetOne = $streetOne;
+        $this->streetTwo = $streetTwo;
+        $this->countryId = $countryId;
+        $this->stateId = $stateId;
+        $this->districtId = $districtId;
+        $this->postCode = $postCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStreetOne(): string
+    {
+        return $this->streetOne;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getStreetTwo(): ?string
+    {
+        return $this->streetTwo;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCountryId(): int
+    {
+        return $this->countryId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStateId(): int
+    {
+        return $this->stateId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getDistrictId(): int
+    {
+        return $this->districtId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPostCode(): int
+    {
+        return $this->postCode;
+    }
+
+
+}
diff --git a/app/Classes/Modules/Transports/Services/CreatesTransport.php b/app/Classes/Modules/Transports/Services/CreatesTransport.php
new file mode 100644
index 00000000..80a08a16
--- /dev/null
+++ b/app/Classes/Modules/Transports/Services/CreatesTransport.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Models\Transport;
+use App\Models\Company;
+
+class CreatesTransport extends AbstractUpdateRelationshipRecord
+{
+
+    /**
+     * @param Company $company
+     * @param TransportObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $company, TransportObject $object) {
+        $model = new Transport();
+        $model->street_one = $object->getStreetOne();
+        $model->street_two = $object->getStreetTwo();
+        $model->country_id = $object->getCountryId();
+        $model->state_id = $object->getStateId();
+        $model->district_id = $object->getDistrictId();
+        $model->postcode = $object->getPostCode();
+
+        return $this->handler($company->Transports(), $model);
+
+    }
+}
diff --git a/app/Classes/Modules/Transports/Services/DeletesTransport.php b/app/Classes/Modules/Transports/Services/DeletesTransport.php
new file mode 100644
index 00000000..b75d7db3
--- /dev/null
+++ b/app/Classes/Modules/Transports/Services/DeletesTransport.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Transport;
+
+class DeletesTransport extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Transport $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Transport $model) {
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Transports/Services/FetchesTransport.php b/app/Classes/Modules/Transports/Services/FetchesTransport.php
new file mode 100644
index 00000000..2d507237
--- /dev/null
+++ b/app/Classes/Modules/Transports/Services/FetchesTransport.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Transport;
+
+class FetchesTransport extends AbstractFetchRecord
+{
+
+    /** @var Transport */
+    private $repository;
+
+    /**
+     * FetchesTransport constructor.
+     * @param Transport $repository
+     */
+    public function __construct(Transport $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Transports/Services/ListsTransports.php b/app/Classes/Modules/Transports/Services/ListsTransports.php
new file mode 100644
index 00000000..904dab0f
--- /dev/null
+++ b/app/Classes/Modules/Transports/Services/ListsTransports.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Transport;
+
+class ListsTransports extends AbstractListRecord
+{
+
+    /** @var Transport */
+    private $repository;
+
+    /**
+     * ListsTransports constructor.
+     * @param Transport $repository
+     */
+    public function __construct(Transport $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Transports/Services/UpdatesTransport.php b/app/Classes/Modules/Transports/Services/UpdatesTransport.php
new file mode 100644
index 00000000..155e793d
--- /dev/null
+++ b/app/Classes/Modules/Transports/Services/UpdatesTransport.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Models\Transport;
+
+class UpdatesTransport extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Transport $model
+     * @param TransportObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Transport $model, TransportObject $object) {
+
+        //$model->company_id = $object->getCompanyId();
+        $model->street_one = $object->getStreetOne();
+        $model->street_two = $object->getStreetTwo();
+        $model->district_id = $object->getDistrictId();
+        $model->state_id = $object->getStateId();
+        $model->postcode = $object->getPostCode();
+        $model->country_id = $object->getCountryId();
+        //$model->default = $object->getDefault();
+        //$model->billing = $object->getBilling();
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Classes/Modules/Transports/Standards/Rules/CanCreateTransport.php b/app/Classes/Modules/Transports/Standards/Rules/CanCreateTransport.php
new file mode 100644
index 00000000..a7e41ea1
--- /dev/null
+++ b/app/Classes/Modules/Transports/Standards/Rules/CanCreateTransport.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Transports\Standards\Validators\TransportValidation;
+
+class CanCreateTransport extends AbstractRule
+{
+
+    /** @var TransportValidation */
+    private $TransportValidation;
+
+    /**
+     * CanCreateTransport constructor.
+     * @param TransportValidation $TransportValidation
+     */
+    public function __construct(TransportValidation $TransportValidation)
+    {
+        $this->TransportValidation = $TransportValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param TransportObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->TransportValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param TransportObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/Standards/Rules/CanDeleteTransport.php b/app/Classes/Modules/Transports/Standards/Rules/CanDeleteTransport.php
new file mode 100644
index 00000000..1d1e94ab
--- /dev/null
+++ b/app/Classes/Modules/Transports/Standards/Rules/CanDeleteTransport.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+
+class CanDeleteTransport extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param TransportObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param TransportObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/Standards/Rules/CanFetchTransport.php b/app/Classes/Modules/Transports/Standards/Rules/CanFetchTransport.php
new file mode 100644
index 00000000..05ef9121
--- /dev/null
+++ b/app/Classes/Modules/Transports/Standards/Rules/CanFetchTransport.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+
+class CanFetchTransport extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param TransportObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param TransportObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/Standards/Rules/CanListTransports.php b/app/Classes/Modules/Transports/Standards/Rules/CanListTransports.php
new file mode 100644
index 00000000..2a056f5c
--- /dev/null
+++ b/app/Classes/Modules/Transports/Standards/Rules/CanListTransports.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+
+class CanListTransports extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param TransportObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param TransportObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/Standards/Rules/CanUpdateTransport.php b/app/Classes/Modules/Transports/Standards/Rules/CanUpdateTransport.php
new file mode 100644
index 00000000..05fd4484
--- /dev/null
+++ b/app/Classes/Modules/Transports/Standards/Rules/CanUpdateTransport.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Transports\Standards\Validators\TransportValidation;
+
+class CanUpdateTransport extends AbstractRule
+{
+
+    /** @var TransportValidation */
+    private $TransportValidation;
+
+    /**
+     * CanUpdateTransport constructor.
+     * @param TransportValidation $TransportValidation
+     */
+    public function __construct(TransportValidation $TransportValidation)
+    {
+        $this->TransportValidation = $TransportValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param TransportObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->TransportValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param TransportObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Transports/Standards/Validators/TransportValidation.php b/app/Classes/Modules/Transports/Standards/Validators/TransportValidation.php
new file mode 100644
index 00000000..83737634
--- /dev/null
+++ b/app/Classes/Modules/Transports/Standards/Validators/TransportValidation.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Modules\Transports\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+
+class TransportValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param TransportObject $object
+     * @return array
+     */
+    protected function data($object): array {
+        return [
+            'street_one' => $object->getStreetOne(),
+            'street_two' => $object->getStreetTwo(),
+            'district_id' => $object->getDistrictId()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'street_one' => 'required',
+            'district_id' => 'required',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
diff --git a/app/Http/Controllers/Remarks/CreateRemarkController.php b/app/Http/Controllers/Remarks/CreateRemarkController.php
index 530e2737..313a25b6 100644
--- a/app/Http/Controllers/Remarks/CreateRemarkController.php
+++ b/app/Http/Controllers/Remarks/CreateRemarkController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Remark;
 
-use App\Classes\Modules\Addresses\ControllersLogic\CreateAddressLogic;
+use App\Classes\Modules\Remark\ControllersLogic\CreateRemarkLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class CreateRemarkController
 {
     /**
      * @param Request $request
-     * @param CreateAddressLogic $logic
+     * @param CreateRemarkLogic $logic
      * @return JsonResponse
      */
-    public function create(Request $request, CreateAddressLogic $logic): JsonResponse {
+    public function create(Request $request, CreateRemarkLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Remarks/DeleteRemarkController.php b/app/Http/Controllers/Remarks/DeleteRemarkController.php
index ab38015e..aa292c48 100644
--- a/app/Http/Controllers/Remarks/DeleteRemarkController.php
+++ b/app/Http/Controllers/Remarks/DeleteRemarkController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Remark;
 
-use App\Classes\Modules\Addresses\ControllersLogic\DeleteAddressLogic;
+use App\Classes\Modules\Remark\ControllersLogic\DeleteRemarkLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class DeleteRemarkController
 {
     /**
      * @param Request $request
-     * @param DeleteAddressLogic $logic
+     * @param DeleteRemarkLogic $logic
      * @return JsonResponse
      */
-    public function destroy(Request $request, DeleteAddressLogic $logic): JsonResponse {
+    public function destroy(Request $request, DeleteRemarkLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Remarks/FetchRemarkController.php b/app/Http/Controllers/Remarks/FetchRemarkController.php
index c9319712..b5c31024 100644
--- a/app/Http/Controllers/Remarks/FetchRemarkController.php
+++ b/app/Http/Controllers/Remarks/FetchRemarkController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Remark;
 
-use App\Classes\Modules\Addresses\ControllersLogic\FetchAddressLogic;
+use App\Classes\Modules\Remark\ControllersLogic\FetchRemarkLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class FetchRemarkController
 {
     /**
      * @param Request $request
-     * @param FetchAddressLogic $logic
+     * @param FetchRemarkLogic $logic
      * @return JsonResponse
      */
-    public function fetch(Request $request, FetchAddressLogic $logic): JsonResponse {
+    public function fetch(Request $request, FetchRemarkLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Remarks/ListRemarksController.php b/app/Http/Controllers/Remarks/ListRemarksController.php
index fded91e7..85d16ff6 100644
--- a/app/Http/Controllers/Remarks/ListRemarksController.php
+++ b/app/Http/Controllers/Remarks/ListRemarksController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Remark;
 
-use App\Classes\Modules\Addresses\ControllersLogic\ListAddressesLogic;
+use App\Classes\Modules\Remark\ControllersLogic\ListRemarkLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class ListRemarksController
 {
     /**
      * @param Request $request
-     * @param ListAddressesLogic $logic
+     * @param ListRemarkLogic $logic
      * @return JsonResponse
      */
-    public function list(Request $request, ListAddressesLogic $logic): JsonResponse {
+    public function list(Request $request, ListRemarkLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Remarks/UpdateRemarkController.php b/app/Http/Controllers/Remarks/UpdateRemarkController.php
index dcc60dc0..b18efcf7 100644
--- a/app/Http/Controllers/Remarks/UpdateRemarkController.php
+++ b/app/Http/Controllers/Remarks/UpdateRemarkController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Remark;
 
-use App\Classes\Modules\Addresses\ControllersLogic\UpdateAddressLogic;
+use App\Classes\Modules\Remark\ControllersLogic\UpdateRemarkLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class UpdateRemarkController
 {
     /**
      * @param Request $request
-     * @param UpdateAddressLogic $logic
+     * @param UpdateRemarkLogic $logic
      * @return JsonResponse
      */
-    public function update(Request $request, UpdateAddressLogic $logic): JsonResponse {
+    public function update(Request $request, UpdateRemarkLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Schedules/CreateScheduleController.php b/app/Http/Controllers/Schedules/CreateScheduleController.php
index 530e2737..ff154ee1 100644
--- a/app/Http/Controllers/Schedules/CreateScheduleController.php
+++ b/app/Http/Controllers/Schedules/CreateScheduleController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Schedules;
 
-use App\Classes\Modules\Addresses\ControllersLogic\CreateAddressLogic;
+use App\Classes\Modules\Schedules\ControllersLogic\CreateScheduleLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class CreateRemarkController
 {
     /**
      * @param Request $request
-     * @param CreateAddressLogic $logic
+     * @param CreateScheduleLogic $logic
      * @return JsonResponse
      */
-    public function create(Request $request, CreateAddressLogic $logic): JsonResponse {
+    public function create(Request $request, CreateScheduleLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Schedules/DeleteScheduleController.php b/app/Http/Controllers/Schedules/DeleteScheduleController.php
index ab38015e..de9d178c 100644
--- a/app/Http/Controllers/Schedules/DeleteScheduleController.php
+++ b/app/Http/Controllers/Schedules/DeleteScheduleController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Schedules;
 
-use App\Classes\Modules\Addresses\ControllersLogic\DeleteAddressLogic;
+use App\Classes\Modules\Schedules\ControllersLogic\DeleteScheduleLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class DeleteRemarkController
 {
     /**
      * @param Request $request
-     * @param DeleteAddressLogic $logic
+     * @param DeleteScheduleLogic $logic
      * @return JsonResponse
      */
-    public function destroy(Request $request, DeleteAddressLogic $logic): JsonResponse {
+    public function destroy(Request $request, DeleteScheduleLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Schedules/FetchScheduleController.php b/app/Http/Controllers/Schedules/FetchScheduleController.php
index c9319712..6f393e6a 100644
--- a/app/Http/Controllers/Schedules/FetchScheduleController.php
+++ b/app/Http/Controllers/Schedules/FetchScheduleController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Schedules;
 
-use App\Classes\Modules\Addresses\ControllersLogic\FetchAddressLogic;
+use App\Classes\Modules\Schedules\ControllersLogic\FetchScheduleLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class FetchRemarkController
 {
     /**
      * @param Request $request
-     * @param FetchAddressLogic $logic
+     * @param FetchScheduleLogic $logic
      * @return JsonResponse
      */
-    public function fetch(Request $request, FetchAddressLogic $logic): JsonResponse {
+    public function fetch(Request $request, FetchScheduleLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Schedules/ListSchedulesController.php b/app/Http/Controllers/Schedules/ListSchedulesController.php
index fded91e7..996b0d1d 100644
--- a/app/Http/Controllers/Schedules/ListSchedulesController.php
+++ b/app/Http/Controllers/Schedules/ListSchedulesController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Schedules;
 
-use App\Classes\Modules\Addresses\ControllersLogic\ListAddressesLogic;
+use App\Classes\Modules\Schedules\ControllersLogic\ListSchedulesLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class ListRemarksController
 {
     /**
      * @param Request $request
-     * @param ListAddressesLogic $logic
+     * @param ListSchedulesLogic $logic
      * @return JsonResponse
      */
-    public function list(Request $request, ListAddressesLogic $logic): JsonResponse {
+    public function list(Request $request, ListSchedulesLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Schedules/UpdateScheduleController.php b/app/Http/Controllers/Schedules/UpdateScheduleController.php
index dcc60dc0..80a630c2 100644
--- a/app/Http/Controllers/Schedules/UpdateScheduleController.php
+++ b/app/Http/Controllers/Schedules/UpdateScheduleController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Schedules;
 
-use App\Classes\Modules\Addresses\ControllersLogic\UpdateAddressLogic;
+use App\Classes\Modules\Schedules\ControllersLogic\UpdateScheduleLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class UpdateRemarkController
 {
     /**
      * @param Request $request
-     * @param UpdateAddressLogic $logic
+     * @param UpdateScheduleLogic $logic
      * @return JsonResponse
      */
-    public function update(Request $request, UpdateAddressLogic $logic): JsonResponse {
+    public function update(Request $request, UpdateScheduleLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Transports/CreateTransportController.php b/app/Http/Controllers/Transports/CreateTransportController.php
index 530e2737..e9b179ed 100644
--- a/app/Http/Controllers/Transports/CreateTransportController.php
+++ b/app/Http/Controllers/Transports/CreateTransportController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Transports;
 
-use App\Classes\Modules\Addresses\ControllersLogic\CreateAddressLogic;
+use App\Classes\Modules\Transports\ControllersLogic\CreateTransportLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class CreateRemarkController
 {
     /**
      * @param Request $request
-     * @param CreateAddressLogic $logic
+     * @param CreateTransportLogic $logic
      * @return JsonResponse
      */
-    public function create(Request $request, CreateAddressLogic $logic): JsonResponse {
+    public function create(Request $request, CreateTransportLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Transports/DeleteTransportController.php b/app/Http/Controllers/Transports/DeleteTransportController.php
index ab38015e..4b4fe378 100644
--- a/app/Http/Controllers/Transports/DeleteTransportController.php
+++ b/app/Http/Controllers/Transports/DeleteTransportController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Transports;
 
-use App\Classes\Modules\Addresses\ControllersLogic\DeleteAddressLogic;
+use App\Classes\Modules\Transports\ControllersLogic\DeleteTransportLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class DeleteRemarkController
 {
     /**
      * @param Request $request
-     * @param DeleteAddressLogic $logic
+     * @param DeleteTransportLogic $logic
      * @return JsonResponse
      */
-    public function destroy(Request $request, DeleteAddressLogic $logic): JsonResponse {
+    public function destroy(Request $request, DeleteTransportLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Transports/FetchTransportController.php b/app/Http/Controllers/Transports/FetchTransportController.php
index c9319712..7ab2b449 100644
--- a/app/Http/Controllers/Transports/FetchTransportController.php
+++ b/app/Http/Controllers/Transports/FetchTransportController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Transports;
 
-use App\Classes\Modules\Addresses\ControllersLogic\FetchAddressLogic;
+use App\Classes\Modules\Transports\ControllersLogic\FetchTransportLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class FetchRemarkController
 {
     /**
      * @param Request $request
-     * @param FetchAddressLogic $logic
+     * @param FetchTransportLogic $logic
      * @return JsonResponse
      */
-    public function fetch(Request $request, FetchAddressLogic $logic): JsonResponse {
+    public function fetch(Request $request, FetchTransportLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Transports/ListTransportsController.php b/app/Http/Controllers/Transports/ListTransportsController.php
index fded91e7..8050ca13 100644
--- a/app/Http/Controllers/Transports/ListTransportsController.php
+++ b/app/Http/Controllers/Transports/ListTransportsController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Transports;
 
-use App\Classes\Modules\Addresses\ControllersLogic\ListAddressesLogic;
+use App\Classes\Modules\Transports\ControllersLogic\ListTransportsLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class ListRemarksController
 {
     /**
      * @param Request $request
-     * @param ListAddressesLogic $logic
+     * @param ListTransportsLogic $logic
      * @return JsonResponse
      */
-    public function list(Request $request, ListAddressesLogic $logic): JsonResponse {
+    public function list(Request $request, ListTransportsLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Transports/UpdateTransportController.php b/app/Http/Controllers/Transports/UpdateTransportController.php
index dcc60dc0..28704686 100644
--- a/app/Http/Controllers/Transports/UpdateTransportController.php
+++ b/app/Http/Controllers/Transports/UpdateTransportController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Addresses;
+namespace App\Http\Controllers\Transports;
 
-use App\Classes\Modules\Addresses\ControllersLogic\UpdateAddressLogic;
+use App\Classes\Modules\Transports\ControllersLogic\UpdateTransportLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class UpdateRemarkController
 {
     /**
      * @param Request $request
-     * @param UpdateAddressLogic $logic
+     * @param UpdateTransportLogic $logic
      * @return JsonResponse
      */
-    public function update(Request $request, UpdateAddressLogic $logic): JsonResponse {
+    public function update(Request $request, UpdateTransportLogic $logic): JsonResponse {
         return $logic->execute($request);
     }