diff --git a/app/Classes/General/Eloquent/Filters/WithOwner.php b/app/Classes/General/Eloquent/Filters/WithOwner.php
new file mode 100644
index 00000000..7d31691e
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WithOwner.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithOwner implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('owner');
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/WithPackingLists.php b/app/Classes/General/Eloquent/Filters/WithPackingLists.php
new file mode 100644
index 00000000..927aa526
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WithPackingLists.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithPackingLists implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('packingLists');
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php b/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php
index 76c66b52..b4453c3a 100644
--- a/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php
+++ b/app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php
@@ -3,6 +3,7 @@
 namespace App\Classes\Modules\Addresses\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 class AddressObject implements DataTransferObject
 {
@@ -38,7 +39,7 @@ class AddressObject implements DataTransferObject
      * @param int $postCode
      * @param null|string $reference
      */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null, ?int $status = ApprovalStatus::APPROVED)
     {
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
@@ -47,6 +48,7 @@ class AddressObject implements DataTransferObject
         $this->districtId = $districtId;
         $this->postCode = $postCode;
         $this->reference = $reference;
+        $this->status = $status;
     }
 
     /**
@@ -105,5 +107,13 @@ class AddressObject implements DataTransferObject
         return $this->reference;
     }
 
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Addresses/Services/CreatesAddress.php b/app/Classes/Modules/Addresses/Services/CreatesAddress.php
index b6662a98..b9f2716c 100644
--- a/app/Classes/Modules/Addresses/Services/CreatesAddress.php
+++ b/app/Classes/Modules/Addresses/Services/CreatesAddress.php
@@ -28,6 +28,7 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
         $model->state_id = $object->getStateId();
         $model->district_id = $object->getDistrictId();
         $model->postcode = $object->getPostCode();
+        $model->status = $object->getStatus();
 
         return $this->handler($addressable->addresses(), $model);
 
diff --git a/app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php b/app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php
new file mode 100644
index 00000000..0b469fd1
--- /dev/null
+++ b/app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Processors\ApproveChangeOrderAddressProcessor;
+use App\Http\Resources\AddressResource;
+use App\Http\Resources\OrderResource;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+
+class ApproveChangeOrderAddressLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Change Order Address Approval',
+            'message' => 'You have successfully change the order address'
+        ];
+    }
+
+    /** @var ApproveChangeOrderAddressProcessor */
+    private $approveChangeOrderAddressProcessor;
+
+    /**
+     * ApproveChangeOrderAddressLogic constructor.
+     * @param ApproveChangeOrderAddressProcessor $approveChangeOrderAddressProcessor
+     */
+
+    public function __construct(ApproveChangeOrderAddressProcessor $approveChangeOrderAddressProcessor)
+    {
+        $this->approveChangeOrderAddressProcessor = $approveChangeOrderAddressProcessor;
+    }
+
+    public function logic(Request $request): JsonResponse
+    {
+        $address = $this->approveChangeOrderAddressProcessor->execute($request);
+
+        return $this->resourceResponse(new AddressResource($address));
+    }
+}
diff --git a/app/Classes/Modules/Orders/ControllersLogic/RequestChangeOrderAddressLogic.php b/app/Classes/Modules/Orders/ControllersLogic/RequestChangeOrderAddressLogic.php
new file mode 100644
index 00000000..b0c24f0b
--- /dev/null
+++ b/app/Classes/Modules/Orders/ControllersLogic/RequestChangeOrderAddressLogic.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Processors\RequestChangeOrderAddressProcessor;
+use App\Http\Resources\OrderResource;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+
+class RequestChangeOrderAddressLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Request To Change Order Address',
+            'message' => 'You have successfully request to change order address'
+        ];
+    }
+
+    /** @var RequestChangeOrderAddressProcessor */
+    private $requestChangeOrderAddressProcessor;
+
+    /**
+     * RequestChangeOrderAddressLogic constructor.
+     * @param RequestChangeOrderAddressProcessor $requestChangeOrderAddressProcessor
+     */
+
+    public function __construct(RequestChangeOrderAddressProcessor $requestChangeOrderAddressProcessor)
+    {
+        $this->requestChangeOrderAddressProcessor = $requestChangeOrderAddressProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+
+    public function logic(Request $request): JsonResponse
+    {
+        $order = $this->requestChangeOrderAddressProcessor->execute($request);
+
+        return $this->resourceResponse(new OrderResource($order));
+    }
+}
diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
new file mode 100644
index 00000000..fbd84f90
--- /dev/null
+++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Processors;
+
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
+use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use Illuminate\Http\Request;
+
+class ApproveChangeOrderAddressProcessor
+{
+    /** @var CanApproveChangeOrderAddress */
+    private $canApproveChangeOrderAddress;
+
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
+    /** @var UpdatesOrdersAddress */
+    private $updatesOrdersAddress;
+
+    /**
+     * ApproveChangeOrderAddressProcessor constructor.
+     * @param CanApproveChangeOrderAddress $canApproveChangeOrderAddress
+     * @param FetchesAddress $fetchesAddress
+     * @param UpdatesOrdersAddress $updatesOrdersAddress
+     */
+    public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesAddress $fetchesAddress, UpdatesOrdersAddress $updatesOrdersAddress)
+    {
+        $this->canApproveChangeOrderAddress = $canApproveChangeOrderAddress;
+        $this->fetchesAddress = $fetchesAddress;
+        $this->updatesOrdersAddress = $updatesOrdersAddress;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return mixed
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request)
+    {
+
+        $status = (int) $request->route('status');
+
+        $this->canApproveChangeOrderAddress->passes();
+
+        $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
+
+        if($status === ApprovalStatus::APPROVED){
+            $address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
+        }
+
+        $this->updatesOrdersAddress->execute($address, $status);
+
+        return $address;
+    }
+}
diff --git a/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
new file mode 100644
index 00000000..7f01726b
--- /dev/null
+++ b/app/Classes/Modules/Orders/Processors/RequestChangeOrderAddressProcessor.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Processors;
+
+use App\Classes\Modules\Orders\Standards\Rules\CanChangeOrderAddress;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Addresses\Services\DeletesAddress;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+
+use Illuminate\Http\Request;
+
+class RequestChangeOrderAddressProcessor
+{
+    /** @var CanChangeOrderAddress */
+    private $canChangeOrderAddress;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var DeletesAddress */
+    private $deletesAddress;
+
+    /**
+     * ChangeOrderAddressProcessor constructor.
+     * @param FetchesOrder $fetchesOrder
+     * @param CreatesAddress $createsAddress
+     * @param FetchesAddress $fetchesAddress
+     * @param DeletesAddress $deletesAddress
+     */
+    public function __construct(CanChangeOrderAddress $canChangeOrderAddress, FetchesOrder $fetchesOrder, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress, DeletesAddress $deletesAddress)
+    {
+
+        $this->canChangeOrderAddress = $canChangeOrderAddress;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->createsAddress = $createsAddress;
+        $this->fetchesAddress = $fetchesAddress;
+        $this->deletesAddress = $deletesAddress;
+    }
+
+
+    public function execute(Request $request)
+    {
+
+        $this->canChangeOrderAddress->passes();
+
+        $order = $this->fetchesOrder->execute(['id' => $request->get('order_id')]);
+        foreach ($order->addressesPendingVerification as $address) {
+            $this->deletesAddress->execute($address);
+        }
+
+        $address = $this->fetchesAddress->execute(['id' => $request->get('address_id')]);
+        $addressObject = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, $address->reference, ApprovalStatus::PENDING_VERIFICATION);
+        $this->createsAddress->execute($order, $addressObject);
+
+        return $order;
+    }
+}
diff --git a/app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php b/app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php
new file mode 100644
index 00000000..352ce64d
--- /dev/null
+++ b/app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\Modules\Orders\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Address;
+
+class UpdatesOrdersAddress extends AbstractUpdateRecord
+{
+    /**
+     * @param Address $address
+     * @param int $type
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Address $address, int $type)
+    {
+        $address->status = $type;
+        return $this->handler($address);
+    }
+}
diff --git a/app/Classes/Modules/Orders/Standards/Rules/CanApproveChangeOrderAddress.php b/app/Classes/Modules/Orders/Standards/Rules/CanApproveChangeOrderAddress.php
new file mode 100644
index 00000000..24ce6418
--- /dev/null
+++ b/app/Classes/Modules/Orders/Standards/Rules/CanApproveChangeOrderAddress.php
@@ -0,0 +1,39 @@
+<?php
+
+
+namespace App\Classes\Modules\Orders\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+
+
+class CanApproveChangeOrderAddress extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param OrderObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+    /**
+     * @param OrderObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Classes/Modules/Orders/Standards/Rules/CanChangeOrderAddress.php b/app/Classes/Modules/Orders/Standards/Rules/CanChangeOrderAddress.php
new file mode 100644
index 00000000..1030168b
--- /dev/null
+++ b/app/Classes/Modules/Orders/Standards/Rules/CanChangeOrderAddress.php
@@ -0,0 +1,39 @@
+<?php
+
+
+namespace App\Classes\Modules\Orders\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+
+
+class CanChangeOrderAddress extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param OrderObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+    /**
+     * @param OrderObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php
index cff8cbb6..40376b12 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerLogic.php
@@ -4,10 +4,12 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\PackingLists\Services\Containers\CreatesContainer;
 use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanCreateContainer;
 use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+
 use App\Http\Resources\ContainerResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -32,13 +34,17 @@ class CreateContainerLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
+     /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
     /** @var CreatesPackingList */
     private $createsContainer;
 
-    public function __construct(CanCreateContainer $canCreateContainer, FetchesPackingList $fetchesPackingList, CreatesContainer $createsContainer)
+    public function __construct(CanCreateContainer $canCreateContainer, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreatesContainer $createsContainer)
     {
         $this->canCreateContainer = $canCreateContainer;
         $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createsContainer = $createsContainer;
     }
 
@@ -51,15 +57,21 @@ class CreateContainerLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
+        $object = new ContainerObject(
+            $request->input('container_reference'), 
+            $request->input('container_number'), 
+            $request->input('seal_reference'),
+            $request->input('container_type'),
+            $request->input('status')
+        );
 
-        $object = new ContainerObject($request->input('container_reference'), $request->input('container_type'), $request->input('seal_reference'));
+        $company = $this->fetchesCompanyModule->execute(['id' => 2]);
 
         $this->canCreateContainer->passes($object);
 
-        $query = $this->createsContainer->execute($object);
+        $query = $this->createsContainer->execute($object, $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]));
 
         return $this->resourceResponse(new ContainerResource($query));
-
     }
 
 }
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php
index 3d1516f0..72537db2 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/UpdateContainerLogic.php
@@ -58,8 +58,14 @@ class UpdateContainerLogic extends AbstractControllerLogic
     {
 
         $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-
-        $object = new ContainerObject( $container->packing_list_id , $request->input('container_reference'), $request->input('container_type'), $request->input('seal_reference'));
+        
+        $object = new ContainerObject( 
+            $request->input('container_reference'), 
+            $container->container_number, 
+            $request->input('container_type'), 
+            $request->input('seal_reference'),
+            $container->status, 
+        );
 
         $this->canUpdateContainer->passes($object);
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
index a06a6842..afd8f3d7 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
@@ -5,6 +5,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
 use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
@@ -13,6 +14,9 @@ use App\Classes\Modules\PackingLists\Services\CreatesPackingListPackage;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingListPackage;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+
 use App\Http\Resources\PackingListResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -34,13 +38,18 @@ class CreatePackingListLogic extends AbstractControllerLogic
     /** @var CreatePackingListProcessor */
     private $createPackingListProcessor;
 
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
     /**
      * CreatePackingListLogic constructor.
      * @param CreatePackingListProcessor $createPackingListProcessor
+     * @param FetchesOrder $fetchesOrder
      */
-    public function __construct(CreatePackingListProcessor $createPackingListProcessor)
+    public function __construct(CreatePackingListProcessor $createPackingListProcessor, FetchesOrder $fetchesOrder)
     {
         $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->fetchesOrder = $fetchesOrder;
     }
 
     /**
@@ -50,11 +59,13 @@ class CreatePackingListLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
 
-        $object = new PackingListObject($request->input('reference_number'), ApprovalStatus::PENDING_SUBMISSION);
+        $order = $this->fetchesOrder->execute(['reference' => $request->input('reference_number')]);
 
-        $query = $this->createPackingListProcessor->execute($object);
+        $packingListObject = new PackingListObject($request->input('reference_number'), $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::PENDING_SUBMISSION);
 
-        return $this->resourceResponse(new PackingListResource($query));
+        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+        return $this->resourceResponse(new PackingListResource($packingList));
 
     }
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
index c9eebc15..80a5ee5d 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageLogic.php
@@ -12,6 +12,7 @@ use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Http\Resources\PackageResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Classes\ValueObjects\Constants\PackageType;
 
 class CreatePackageLogic extends AbstractControllerLogic
 {
@@ -61,23 +62,23 @@ class CreatePackageLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-
+        
         $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
 
         $object = new PackageObject(
-            null,
             $request->input('type'),
             $request->input('description'),
             $request->input('width'),
             $request->input('height'),
             $request->input('length'),
             $request->input('weight'),
+            0,
             $request->input('quantity'),
             ApprovalStatus::PENDING_VERIFICATION);
 
         $this->canCreatePackage->passes($object);
 
-        $query = $this->createsPackage->execute($object);
+        $query = $this->createsPackage->execute($object, $order->packingLists()->first());
 
         return $this->resourceResponse(new PackageResource($query));
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/FetchPackageLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/FetchPackageLogic.php
index d2e8be81..0dcb6b07 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/FetchPackageLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/FetchPackageLogic.php
@@ -4,8 +4,8 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Packages\Services\FetchesPackage;
-use App\Classes\Modules\Packages\Standards\Rules\CanFetchPackage;
+use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
+use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanFetchPackage;
 use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php
index 48aee051..80d73e5b 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/ListPackagesLogic.php
@@ -4,8 +4,8 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Packages\Services\ListsPackages;
-use App\Classes\Modules\Packages\Standards\Rules\CanListPackages;
+use App\Classes\Modules\PackingLists\Services\Packages\ListsPackages;
+use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanListPackages;
 use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/UpdatePackageLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/UpdatePackageLogic.php
index b96e6933..6b25e3a5 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Packages/UpdatePackageLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Packages/UpdatePackageLogic.php
@@ -4,10 +4,10 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Packages\Services\UpdatesPackage;
-use App\Classes\Modules\Packages\Services\FetchesPackage;
-use App\Classes\Modules\Packages\Standards\Rules\CanUpdatePackage;
-use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\Services\Packages\UpdatesPackage;
+use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
+use App\Classes\Modules\PackingLists\Standards\Rules\Packages\CanUpdatePackage;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -60,8 +60,6 @@ class UpdatePackageLogic extends AbstractControllerLogic
         $package = $this->fetchesPackage->execute(['id' => $request->route('id')]);
 
         $object = new PackageObject(
-            $package->order_id,
-            null,
             $request->input('type'),
             $request->input('description'),
             $request->input('width'),
@@ -69,7 +67,9 @@ class UpdatePackageLogic extends AbstractControllerLogic
             $request->input('length'),
             $request->input('weight'),
             $request->input('quantity'),
-            $request->input('status'));
+            $request->input('status'),
+            $package->reference
+        );
 
         $this->canUpdatePackage->passes($object);
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php
index 926b9873..7f5232dc 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php
@@ -57,7 +57,7 @@ class UpdatePackingListLogic extends AbstractControllerLogic
     {
         $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-        $object = new PackingListObject($packingList->reference, $request->input('status'));
+        $object = new PackingListObject($packingList->reference, $packingList->claimant_id, $packingList->type, $request->input('status'));
 
         $this->canUpdatePackingList->passes($object);
 
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
new file mode 100644
index 00000000..67a1733c
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingList;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingListStatus;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanUpdatePackingList;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Http\Resources\PackingListResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdatePackingListStatusLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated PackingList Status',
+            'message' => 'You have successfully updated the PackingList status'
+        ];
+    }
+
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var UpdatesPackingListStatus */
+    private $updatesPackingListStatus;
+
+    /**
+     * UpdatePackingListStatusLogic constructor.
+     * @param FetchesPackingList $fetchesPackingList
+     * @param UpdatesPackingListStatus $updatesPackingListStatus
+     */
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesPackingListStatus $updatesPackingListStatus)
+    {
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->updatesPackingListStatus = $updatesPackingListStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+
+        $query = $this->updatesPackingListStatus->execute($packingList, $request->route('status'));
+
+        return $this->resourceResponse(new PackingListResource($query));
+    }
+
+}
diff --git a/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php b/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php
index 92b0effa..3924102c 100644
--- a/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php
+++ b/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerObject.php
@@ -14,7 +14,7 @@ class ContainerObject implements DataTransferObject
     private $containerNumber;
 
     /** @var string */
-    private $sealNumber;
+    private $sealReference;
 
     /** @var int  */
     private $containerType;
@@ -26,15 +26,15 @@ class ContainerObject implements DataTransferObject
      * ContainerObject constructor.
      * @param string $reference
      * @param string $containerNumber
-     * @param string $sealNumber
+     * @param string $sealReference
      * @param int $containerType
      * @param int $status
      */
-    public function __construct(string $reference, string $containerNumber, string $sealNumber, int $containerType, int $status)
+    public function __construct(string $reference, string $containerNumber, string $sealReference, int $containerType, int $status)
     {
         $this->reference = $reference;
         $this->containerNumber = $containerNumber;
-        $this->sealNumber = $sealNumber;
+        $this->sealReference = $sealReference;
         $this->containerType = $containerType;
         $this->status = $status;
     }
@@ -58,9 +58,9 @@ class ContainerObject implements DataTransferObject
     /**
      * @return string
      */
-    public function getSealNumber(): string
+    public function getSealReference(): string
     {
-        return $this->sealNumber;
+        return $this->sealReference;
     }
 
     /**
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
index cddc41ea..0a0c0158 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
@@ -65,7 +65,6 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
 
     /**
      * @return array
-     * @throws \App\Classes\Exceptions\MalformedRequestException
      */
     public function execute(){
 
@@ -77,7 +76,7 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                 try {
                     $filter = '["RefNo:=%js%\"'.$container->reference.'\"\u0000"]';
 
-                    $containerDetailsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+                    $containerDetailsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                     $containerDetails = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailsRequest);
 
@@ -122,9 +121,15 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
                     if($containerStatus === 'Unstuffing'){
                         $container->update(['status' => ApprovalStatus::COMPLETED]);
                         $container->transports()->first()->update(['drop_date' => Carbon::parse($unstuffingDate)->subDay(), 'status' => ApprovalStatus::COMPLETED]);
-                        $container->packingLists()->update(['status' => ApprovalStatus::APPROVED]);
+
                         /** @var PackingList $packingList */
                         foreach($container->packingLists as $packingList){
+
+                            if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
+                                $packingList->status = ApprovalStatus::APPROVED;
+                                $packingList->save();
+                            }
+
                             $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
                             foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
                                 $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
index 6714472b..14a13064 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchDeliveryListFromVTPortalProcessor.php
@@ -3,8 +3,6 @@
 namespace App\Classes\Modules\PackingLists\Processors;
 
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
 use App\Classes\Modules\Schedules\Services\CreatesSchedule;
 use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
@@ -12,7 +10,6 @@ use App\Classes\Modules\Transports\Services\CreatesTransport;
 use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\PackingList;
@@ -65,7 +62,7 @@ class FetchDeliveryListFromVTPortalProcessor
                 try {
                     $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
-                    $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+                    $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                     $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 2776124d..4069a40d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -137,14 +137,14 @@ class FetchLoadedContainersFromVTPortalProcessor
             $end = $end ? $end : Carbon::now();
             $filter = '["LoadedTime:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+            $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"LoadedTime asc","Filter":'.$filter.'}}'), '');
 
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
 
             foreach ($containers->Rows as $container){
 
                 $filter = '["ContainerID:=%js%'.$container[11].'"]';
-                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                 $containerDetail = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailRequest);
 
@@ -199,7 +199,10 @@ class FetchLoadedContainersFromVTPortalProcessor
 
                         $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
 
-                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::PENDING_VERIFICATION, $contractReference);
+                        $connection = $order->companyModule->connections()->first();
+                        $marking = $connection->invitee_reference;
+
+                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, (int) filter_var($marking, FILTER_SANITIZE_NUMBER_INT) <= 1000 ? ApprovalStatus::PENDING_VERIFICATION : ApprovalStatus::SUSPENDED, $contractReference);
 
                         /** @var PackingList $packingList */
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
index 715c61ba..ecc9c9f0 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchPackingListFromVTPortalProcessor.php
@@ -46,7 +46,9 @@ class FetchPackingListFromVTPortalProcessor
      */
     public function execute(){
 
-        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->where('status', '=', ApprovalStatus::PENDING_VERIFICATION)->get();
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
+            $query->where('status', '=', ApprovalStatus::COMPLETED);
+        })->get();
 
         foreach($packingLists as $packingList){
 
@@ -55,7 +57,7 @@ class FetchPackingListFromVTPortalProcessor
 
                 $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
 
-                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index 476b1426..b9043479 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -128,7 +128,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
             $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
+            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), '');
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 
diff --git a/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php b/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php
index d8d733b2..eb8ff4e0 100644
--- a/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php
+++ b/app/Classes/Modules/PackingLists/Services/Containers/CreatesContainer.php
@@ -22,7 +22,7 @@ class CreatesContainer extends AbstractUpdateRelationshipRecord
         $model->reference = $object->getReference();
         $model->container_number = $object->getContainerNumber();
         $model->container_type = $object->getContainerType();
-        $model->seal_reference = $object->getSealNumber();
+        $model->seal_reference = $object->getSealReference();
         $model->status = $object->getStatus();
 
         return $this->handler($owner->containers(), $model);
diff --git a/app/Classes/Modules/PackingLists/Services/Containers/UpdatesContainer.php b/app/Classes/Modules/PackingLists/Services/Containers/UpdatesContainer.php
index c3f6f1a4..d10102e1 100644
--- a/app/Classes/Modules/PackingLists/Services/Containers/UpdatesContainer.php
+++ b/app/Classes/Modules/PackingLists/Services/Containers/UpdatesContainer.php
@@ -17,7 +17,7 @@ class UpdatesContainer extends AbstractUpdateRecord
      */
     public function execute(Container $model, ContainerObject $object) {
 
-        $model->container_reference = $object->getContainerReference();
+        $model->reference = $object->getReference();
         $model->container_type = $object->getContainerType();
         $model->seal_reference = $object->getSealReference();
 
diff --git a/app/Classes/Modules/PackingLists/Services/Packages/UpdatesPackage.php b/app/Classes/Modules/PackingLists/Services/Packages/UpdatesPackage.php
index 9cb265fd..b1903eb5 100644
--- a/app/Classes/Modules/PackingLists/Services/Packages/UpdatesPackage.php
+++ b/app/Classes/Modules/PackingLists/Services/Packages/UpdatesPackage.php
@@ -10,7 +10,6 @@ class UpdatesPackage extends AbstractUpdateRecord
 {
     public function execute(Package $model, PackageObject $object) {
 
-        $model->claimant_id = $object->getClaimantId();
         $model->type = $object->getType();
         $model->description = $object->getDescription();
         $model->width = $object->getWidth();
diff --git a/app/Classes/Modules/PackingLists/Services/UpdatesPackingListStatus.php b/app/Classes/Modules/PackingLists/Services/UpdatesPackingListStatus.php
new file mode 100644
index 00000000..e25b550f
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/Services/UpdatesPackingListStatus.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\PackingList;
+
+class UpdatesPackingListStatus extends AbstractUpdateRecord
+{
+
+    /**
+     * @param PackingList $model
+     * @param int $status
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(PackingList $model, int $status) {
+
+        $model->status = $status;
+
+        return $this->handler($model);
+
+    }
+}
diff --git a/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php b/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php
index 5bf9c7e9..aecff745 100644
--- a/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php
+++ b/app/Classes/Modules/Schedules/ControllersLogic/CreateScheduleLogic.php
@@ -56,7 +56,7 @@ class CreateScheduleLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $object = new ScheduleObject($request->input('etd'), $request->input('eta'), $request->input('transport_id'), ApprovalStatus::PENDING_SUBMISSION);
+        $object = new ScheduleObject($request->input('etd'), $request->input('eta'), ApprovalStatus::PENDING_SUBMISSION);
 
         $this->canCreateSchedule->passes($object);
 
diff --git a/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php b/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php
index 7d14a3f1..485dc833 100644
--- a/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php
+++ b/app/Classes/Modules/Schedules/Standards/Validators/ScheduleValidation.php
@@ -16,7 +16,6 @@ class ScheduleValidation extends AbstractValidation
      */
     protected function data($object): array {
         return [
-            'transport_id' =>  $object->getTransportId(),
             'etd' => $object->getETD(),
             'eta' => $object->getETA(),
             'status' => $object->getStatus(),
@@ -28,7 +27,6 @@ class ScheduleValidation extends AbstractValidation
      */
     protected function rules(): array {
         return [
-            'transport_id' => 'required',
             'etd' => 'required',
             'eta' => 'required',
         ];
diff --git a/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php b/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
index af438830..edd5690f 100644
--- a/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
+++ b/app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php
@@ -7,7 +7,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transports\Services\CreatesTransport;
 use App\Classes\Modules\Transports\Standards\Rules\CanCreateTransport;
 use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Http\Resources\TransportResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -29,8 +29,8 @@ class CreateTransportLogic extends AbstractControllerLogic
     /** @var CanCreateTransport */
     private $canCreateTransport;
 
-    /** @var FetchesContainer */
-    private $fetchesContainer;
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
 
     /** @var CreatesTransport */
     private $createsTransport;
@@ -38,13 +38,13 @@ class CreateTransportLogic extends AbstractControllerLogic
     /**
      * CreateTransportLogic constructor.
      * @param CanCreateTransport $canCreateTransport
-     * @param FetchesContainer $fetchesContainer
+     * @param FetchesPackingList $fetchesPackingList
      * @param CreatesTransport $createsTransport
      */
-    public function __construct(CanCreateTransport $canCreateTransport, FetchesContainer $fetchesContainer, CreatesTransport $createsTransport)
+    public function __construct(CanCreateTransport $canCreateTransport, FetchesPackingList $fetchesPackingList, CreatesTransport $createsTransport)
     {
         $this->canCreateTransport = $canCreateTransport;
-        $this->fetchesContainer = $fetchesContainer;
+        $this->fetchesPackingList = $fetchesPackingList;
         $this->createsTransport = $createsTransport;
     }
 
@@ -58,11 +58,18 @@ class CreateTransportLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
 
-        $object = new TransportObject($request->input('type'), $request->input('courier'), $request->input('tracking_number'), null, null, ApprovalStatus::PENDING_SUBMISSION);
+        $object = new TransportObject(
+            $request->input('type'), 
+            $request->input('courier'), 
+            $request->input('tracking_number'), 
+            null, 
+            null, 
+            pprovalStatus::PENDING_SUBMISSION
+        );
 
         $this->canCreateTransport->passes($object);
 
-        $query = $this->createsTransport->execute($this->fetchesContainer->execute(['id' => $request->input('container_id')]), $object);
+        $query = $this->createsTransport->execute($object, $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]));
 
         return $this->resourceResponse(new TransportResource($query));
 
diff --git a/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php b/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php
index cab03419..6f6cfd4c 100644
--- a/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php
+++ b/app/Classes/Modules/Transports/ControllersLogic/UpdateTransportLogic.php
@@ -58,7 +58,14 @@ class UpdateTransportLogic extends AbstractControllerLogic
     {
         $query = $this->fetchesTransport->execute(['id' => $request->route('id')]);
 
-        $object = new TransportObject($request->input('type'), $request->input('courier'), $request->input('tracking_number'), $request->input('dispatch_date'), $request->input('drop_date'), $request->input('status'));
+        $object = new TransportObject(
+            $request->input('type'), 
+            $request->input('courier'), 
+            $request->input('tracking_number'), 
+            $request->input('dispatch_date'), 
+            $request->input('drop_date'), 
+            $request->input('status')
+        );
 
         $this->canUpdateTransport->passes($object);
 
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 83b805ad..623233c2 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -31,7 +31,7 @@ class Kernel extends ConsoleKernel
     {
 
         $schedule->call(function(){
-            FetchWarehouseReceiveListFromVTPortalJob::withChain([
+            return FetchWarehouseReceiveListFromVTPortalJob::withChain([
                 new FetchLoadedContainersFromVTPortalJob,
                 new FetchPackingListFromVTPortalJob,
                 new FetchContainersStatusUpdateFromVTPortalJob,
@@ -40,7 +40,7 @@ class Kernel extends ConsoleKernel
         })->dailyAt('15:00');
 
         $schedule->call(function(){
-            FetchWarehouseReceiveListFromVTPortalJob::withChain([
+            return FetchWarehouseReceiveListFromVTPortalJob::withChain([
                 new FetchLoadedContainersFromVTPortalJob,
                 new FetchPackingListFromVTPortalJob,
                 new FetchContainersStatusUpdateFromVTPortalJob,
diff --git a/app/Http/Controllers/Orders/ApproveChangeOrderAddressController.php b/app/Http/Controllers/Orders/ApproveChangeOrderAddressController.php
new file mode 100644
index 00000000..9443ad7b
--- /dev/null
+++ b/app/Http/Controllers/Orders/ApproveChangeOrderAddressController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Classes\Modules\Orders\ControllersLogic\ApproveChangeOrderAddressLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApproveChangeOrderAddressController
+{
+    /**
+     * @param Request $request
+     * @param ApproveChangeOrderAddressLogic $logic
+     * @return JsonResponse
+     */
+    public function approve(Request $request, ApproveChangeOrderAddressLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Orders/RequestChangeOrderAddressController.php b/app/Http/Controllers/Orders/RequestChangeOrderAddressController.php
new file mode 100644
index 00000000..3fb8881f
--- /dev/null
+++ b/app/Http/Controllers/Orders/RequestChangeOrderAddressController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Classes\Modules\Orders\ControllersLogic\RequestChangeOrderAddressLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RequestChangeOrderAddressController
+{
+    /**
+     * @param Request $request
+     * @param ChangeOrderAddressLogic $logic
+     * @return JsonResponse
+     */
+    public function request(Request $request, RequestChangeOrderAddressLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/PackingLists/Containers/CreateContainerPackingListController.php b/app/Http/Controllers/PackingLists/Containers/CreateContainerController.php
similarity index 100%
rename from app/Http/Controllers/PackingLists/Containers/CreateContainerPackingListController.php
rename to app/Http/Controllers/PackingLists/Containers/CreateContainerController.php
diff --git a/app/Http/Controllers/PackingLists/Containers/DeleteContainerPackingListController.php b/app/Http/Controllers/PackingLists/Containers/DeleteContainerController.php
similarity index 100%
rename from app/Http/Controllers/PackingLists/Containers/DeleteContainerPackingListController.php
rename to app/Http/Controllers/PackingLists/Containers/DeleteContainerController.php
diff --git a/app/Http/Controllers/PackingLists/Containers/FetchContainerPackingListController.php b/app/Http/Controllers/PackingLists/Containers/FetchContainerController.php
similarity index 100%
rename from app/Http/Controllers/PackingLists/Containers/FetchContainerPackingListController.php
rename to app/Http/Controllers/PackingLists/Containers/FetchContainerController.php
diff --git a/app/Http/Controllers/PackingLists/Containers/ListContainerPackingListsController.php b/app/Http/Controllers/PackingLists/Containers/ListContainersController.php
similarity index 91%
rename from app/Http/Controllers/PackingLists/Containers/ListContainerPackingListsController.php
rename to app/Http/Controllers/PackingLists/Containers/ListContainersController.php
index 61084f53..8cff9f2e 100644
--- a/app/Http/Controllers/PackingLists/Containers/ListContainerPackingListsController.php
+++ b/app/Http/Controllers/PackingLists/Containers/ListContainersController.php
@@ -10,7 +10,7 @@ class ListContainersController
 {
     /**
      * @param Request $request
-     * @param ListContainerLogic $logic
+     * @param ListContainersLogic $logic
      * @return JsonResponse
      */
     public function list(Request $request, ListContainersLogic $logic): JsonResponse {
diff --git a/app/Http/Controllers/PackingLists/Containers/UpdateContainerPackingListController.php b/app/Http/Controllers/PackingLists/Containers/UpdateContainerController.php
similarity index 100%
rename from app/Http/Controllers/PackingLists/Containers/UpdateContainerPackingListController.php
rename to app/Http/Controllers/PackingLists/Containers/UpdateContainerController.php
diff --git a/app/Http/Controllers/PackingLists/Packages/CreatePackageController.php b/app/Http/Controllers/PackingLists/Packages/CreatePackageController.php
index a3f1ddbb..a540ca51 100644
--- a/app/Http/Controllers/PackingLists/Packages/CreatePackageController.php
+++ b/app/Http/Controllers/PackingLists/Packages/CreatePackageController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\ControllersLogic\Packages\CreatePackageLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\CreatePackageLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/PackingLists/Packages/DeletePackageController.php b/app/Http/Controllers/PackingLists/Packages/DeletePackageController.php
index 455e550d..4e9235c9 100644
--- a/app/Http/Controllers/PackingLists/Packages/DeletePackageController.php
+++ b/app/Http/Controllers/PackingLists/Packages/DeletePackageController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\ControllersLogic\Packages\DeletePackageLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\DeletePackageLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/PackingLists/Packages/FetchPackageController.php b/app/Http/Controllers/PackingLists/Packages/FetchPackageController.php
index 6ad30c56..0bb60451 100644
--- a/app/Http/Controllers/PackingLists/Packages/FetchPackageController.php
+++ b/app/Http/Controllers/PackingLists/Packages/FetchPackageController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\ControllersLogic\Packages\FetchPackageLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\FetchPackageLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/PackingLists/Packages/ListPackagesController.php b/app/Http/Controllers/PackingLists/Packages/ListPackagesController.php
index fe834b6b..75bed1d5 100644
--- a/app/Http/Controllers/PackingLists/Packages/ListPackagesController.php
+++ b/app/Http/Controllers/PackingLists/Packages/ListPackagesController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\ControllersLogic\Packages\ListPackagesLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\ListPackagesLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/PackingLists/Packages/UpdatePackageController.php b/app/Http/Controllers/PackingLists/Packages/UpdatePackageController.php
index cfc2e248..bc334d11 100644
--- a/app/Http/Controllers/PackingLists/Packages/UpdatePackageController.php
+++ b/app/Http/Controllers/PackingLists/Packages/UpdatePackageController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\ControllersLogic\Packages\UpdatePackageLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\UpdatePackageLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/PackingLists/UpdatePackingListStatusController.php b/app/Http/Controllers/PackingLists/UpdatePackingListStatusController.php
new file mode 100644
index 00000000..5d653449
--- /dev/null
+++ b/app/Http/Controllers/PackingLists/UpdatePackingListStatusController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\UpdatePackingListStatusLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdatePackingListStatusController
+{
+    /**
+     * @param Request $request
+     * @param UpdatePackingListStatusLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdatePackingListStatusLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Resources/AddressResource.php b/app/Http/Resources/AddressResource.php
index 3b4c465b..b6903599 100644
--- a/app/Http/Resources/AddressResource.php
+++ b/app/Http/Resources/AddressResource.php
@@ -23,7 +23,8 @@ class AddressResource extends JsonResource
             'state' => $this->state,
             'post_code' => $this->postcode,
             'country' => $this->country,
-            'default' => (int) $this->default
+            'default' => (int) $this->default,
+            'owner' => new OrderResource($this->whenLoaded('owner'))
         ];
     }
 }
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index f338d095..702319aa 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -35,6 +35,7 @@ class CompanyResource extends JsonResource
             'company_module' => new CompanyModuleResource($companyModule),
             'last_order' => new OrderResource($companyModule ? $companyModule->orders()->orderBy('id', 'DESC')->first(): null),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
+            'created_at' => $this->created_at->format('d-m-Y')
 
         ];
 
diff --git a/app/Http/Resources/ContainerResource.php b/app/Http/Resources/ContainerResource.php
index f1d3671f..774ada84 100644
--- a/app/Http/Resources/ContainerResource.php
+++ b/app/Http/Resources/ContainerResource.php
@@ -21,6 +21,10 @@ class ContainerResource extends JsonResource
             'container_number' => $this->container_number,
             'seal_reference' => $this->seal_reference,
             'transport' => new TransportResource($this->transports()->first()),
+            'packing_lists' => PackingListResource::collection($this->whenLoaded('packingLists', function(){
+                return $this->packingLists()->whereHas('packages')->get();
+            })),
+            'status' => $this->status
         ];
     }
 }
diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index 183536e3..390ca1ef 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -27,7 +27,8 @@ class OrderResource extends JsonResource
             'status' => (int) $this->status,
             'company_module' => new CompanyModuleResource($this->companyModule),
             'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee),
-            'address' => new AddressResource($this->addresses()->first()),
+            'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
+            'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
             $this->mergeWhen($this->relationLoaded('parcels'), [
                 'origin_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
                     return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('containers', function($query) {
diff --git a/app/Http/Resources/PackageResource.php b/app/Http/Resources/PackageResource.php
index 7a3209d1..d69ae652 100644
--- a/app/Http/Resources/PackageResource.php
+++ b/app/Http/Resources/PackageResource.php
@@ -23,7 +23,7 @@ class PackageResource extends JsonResource
             'length' => floatval($this->length),
             'weight' => $this->weight,
             'quantity' => $this->quantity,
-            'cbm' => (($this->width / 100) * ($this->width / 100) * ($this->width / 100)) * $this->quantity,
+            'cbm' => (($this->width / 100) * ($this->height / 100) * ($this->length / 100)) * $this->quantity,
             'status' => $this->status,
             'order' => new OrderResource($this->packingList->owner),
             'container' => new ContainerResource($this->packingList->containers()->first()),
diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index e75ce164..4024833d 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -21,6 +21,7 @@ class PackingListResource extends JsonResource
             'status' => $this->status,
             'transport' => new TransportResource($this->transports()->first()),
             'packages' => PackageResource::collection($this->packages),
+            'order' => New OrderResource($this->owner)
         ];
     }
 }
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 4d537646..9d3099a5 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -6,6 +6,7 @@ use App\Classes\General\Interfaces\Addressable;
 use App\Classes\General\Interfaces\Contactable;
 use App\Classes\General\Interfaces\Packable;
 use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Scopes\CustomerOrdersScope;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
@@ -77,4 +78,14 @@ class Order extends AbstractModel implements Addressable, Packable
 //            static::addGlobalScope(new CustomerOrdersScope);
 //        }
     }
+
+    public function addressesPendingVerification()
+    {
+        return $this->addresses()->where('status','=',ApprovalStatus::PENDING_VERIFICATION);
+    }
+
+    public function addressesApproved()
+    {
+        return $this->addresses()->where('status','=',ApprovalStatus::APPROVED);
+    }
 }
diff --git a/database/seeders/CompaniesTableSeeder.php b/database/seeders/CompaniesTableSeeder.php
index 01bb3801..c2ffdeb4 100644
--- a/database/seeders/CompaniesTableSeeder.php
+++ b/database/seeders/CompaniesTableSeeder.php
@@ -172,49 +172,49 @@ class CompaniesTableSeeder extends Seeder
 
         }
 
-        if(true){
-            $companies = OldCompany::all();
+        // if(true){
+        //     $companies = OldCompany::all();
 
-            foreach($companies as $company){
+        //     foreach($companies as $company){
 
-                $marking = explode("CIEF/", $company->marking);
+        //         $marking = explode("CIEF/", $company->marking);
 
-                if(count($marking) < 2){
-                    continue;
-                }
+        //         if(count($marking) < 2){
+        //             continue;
+        //         }
 
-                $marking = str_replace(' ', '', str_replace('/', '', $marking[1]));
+        //         $marking = str_replace(' ', '', str_replace('/', '', $marking[1]));
 
 
-                /** @var Company $newCompany */
-                $newCompany = $this->createCompanyProcessor->execute($company->name, CompanyType::COMPANY_BUSINESS, ApprovalStatus::PENDING_SUBMISSION);
+        //         /** @var Company $newCompany */
+        //         $newCompany = $this->createCompanyProcessor->execute($company->name, CompanyType::COMPANY_BUSINESS, ApprovalStatus::PENDING_SUBMISSION);
 
-                $this->updatesCompanyStatus->execute($newCompany, ApprovalStatus::APPROVED);
+        //         $this->updatesCompanyStatus->execute($newCompany, ApprovalStatus::APPROVED);
 
-                /** @var CompanyModule $companyModule */
-                $companyModule = $this->createCompanyModuleProcessor->execute($newCompany, BusinessType::IMPORTER);
+        //         /** @var CompanyModule $companyModule */
+        //         $companyModule = $this->createCompanyModuleProcessor->execute($newCompany, BusinessType::IMPORTER);
 
-                $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', $marking);
+        //         $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', $marking);
 
-                $connection = $this->createsCompanyConnection->execute($connectionObject);
-                $this->approvesCompanyConnection->execute($connection);
+        //         $connection = $this->createsCompanyConnection->execute($connectionObject);
+        //         $this->approvesCompanyConnection->execute($connection);
 
-                $i = 0;
-                foreach($company->addresses as $address){
-                    $this->createAddressFromOldAddressProcessor->execute($address, $companyModule);
-                    $contact = preg_replace("/[^0-9.]/", "", $address->contact);
-                    if($contact){
-                        $i++;
-                        if($i === 1) {
-                            $contactObject = new ContactObject('', $contact, $company->email, '',);
-                            $this->createContactProcessor->execute($contactObject, $newCompany);
-                        }
-                    }
+        //         $i = 0;
+        //         foreach($company->addresses as $address){
+        //             $this->createAddressFromOldAddressProcessor->execute($address, $companyModule);
+        //             $contact = preg_replace("/[^0-9.]/", "", $address->contact);
+        //             if($contact){
+        //                 $i++;
+        //                 if($i === 1) {
+        //                     $contactObject = new ContactObject('', $contact, $company->email, '',);
+        //                     $this->createContactProcessor->execute($contactObject, $newCompany);
+        //                 }
+        //             }
 
 
-                }
-            }
-        }
+        //         }
+        //     }
+        // }
 
 
     }
diff --git a/resources/assets/sass/modules/_modals.scss b/resources/assets/sass/modules/_modals.scss
index 73272c57..1bafb1cd 100644
--- a/resources/assets/sass/modules/_modals.scss
+++ b/resources/assets/sass/modules/_modals.scss
@@ -269,7 +269,7 @@ body.modal-open {
 			box-shadow: none;
 		}
 		.modal-dialog {
-		    width: 600px;
+		    width: 1140px;
 		}
 		.modal-sm {
 		    width: 300px;
diff --git a/resources/assets/vue/components/address/forms/DeleteAddressFormComponent.vue b/resources/assets/vue/components/address/forms/DeleteAddressFormComponent.vue
deleted file mode 100644
index 9fbc94a1..00000000
--- a/resources/assets/vue/components/address/forms/DeleteAddressFormComponent.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-    <div class="row">
-        <div class="col">
-            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
-            <div class="row justify-content-center" v-show="!isLoading">
-                <div class="col">
-                    <div class="row m-b-20">
-                        <div class="col">
-                            <h3 class="all-caps">Are you Sure?</h3>
-                            <div class="fs-11">Are you sure you want to delete this address?</div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col p-r-5">
-                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
-                        </div>
-                        <div class="col p-l-5">
-                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.address.delete', item.id), 'delete', section, true, true)">Delete</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import componentHandler from '../../../general/mixins/componentHandler';
-    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
-    export default {
-        mixins: [componentHandler, ModalFormHandler]
-
-    }
-</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/address/forms/NewEditAddressFormComponent.vue b/resources/assets/vue/components/address/forms/NewEditAddressFormComponent.vue
deleted file mode 100644
index 8f2fad2b..00000000
--- a/resources/assets/vue/components/address/forms/NewEditAddressFormComponent.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-    <div class="row p-t-25 text-left">
-        <div class="col">
-            <div class="shadow p-3 bg-white rounded">
-                <div class="d-flex flex-row align-items-center">
-                    <input v-show="!isEdit" type="radio" name="answer" id="answer-2"
-                        v-model="computeAddressId"
-                        :value='-1'
-                        :checked="new_address == true"
-                    >
-                    <label for="answer-2" data-question-number="2" class="mb-0 pl-2 pl-md-2 bold">{{isEdit?'Edit ':'Add New '}}Address</label>
-                </div>
-                <div class="col-0" v-if="computeAddressId==-1">
-                    <div class="d-flex flex-column flex-sm-row">
-                        <div class="col px-0 pr-sm-2">
-                            <validation-wrapper-component selecatable :validator="$v.parameters.district_id">
-                            <label class="text-primary fs-12">District</label>
-                            <div class="controls">
-                                <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
-                            </div>
-                            </validation-wrapper-component>
-                        </div>
-                        <div class="col px-0 pl-sm-2">
-                            <validation-wrapper-component :validator="$v.parameters.post_code">
-                            <label class="text-primary fs-12">Post Code</label>
-                            <div class="controls">
-                                <input type="text" class="form-control fs-12" v-model="parameters.post_code">
-                            </div>
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-
-                    <div class="d-flex flex-column flex-sm-row">
-                        <div class="col px-0 pr-sm-2">
-                            <validation-wrapper-component :validator="$v.parameters.street_one">
-                            <label class="text-primary fs-12">Street one</label>
-                            <div class="controls">
-                                <input type="text" class="form-control fs-12"
-                                v-model="parameters.street_one"
-                                >
-                            </div>
-                            </validation-wrapper-component>
-                        </div>
-                        <div class="col px-0 pl-sm-2">
-                            <validation-wrapper-component :validator="$v.parameters.street_two">
-                            <label class="text-primary fs-12">Street two</label>
-                            <div class="controls">
-                                <input type="text" class="form-control fs-12"
-                                v-model="parameters.street_two"
-                                >
-                            </div>
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-
-                    <div class="row  m-t-25">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col text-right">
-                                    <button type="button" class="btn btn-sm btn-primary b-rad-none" @click="submitForm()">{{isEdit?'Update':'Create'}}</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import { required ,requiredIf } from "vuelidate/lib/validators";
-    export default {
-        props: {
-            section: {
-                default: 'addressForm'
-            },
-            isEdit:{
-                default: false
-            },
-            populateWith: {
-               type: Object,
-               default: () => ({ empty: true })
-             },
-            address_id: null
-        },
-        watch: {
-        },
-        data() {
-			return {
-                parameters : {
-                    company_module_id:this.$store.getters.getCompanyModuleId,
-                    street_one: '',
-                    street_two: '',
-                    district_id: '',
-                    post_code: '',
-				},
-                new_address:false
-
-            }
-		},
-
-        computed: {
-            computeAddressId:{
-                get() {
-                    if (!this.populateWith.empty) {
-                    this.parameters = this.populateWith;
-                    this.parameters.district_id = this.populateWith.district.id;
-                    this.parameters.id = this.populateWith.id;
-                    }
-                    return this.address_id;
-                },
-                set(val) {
-                    this.$emit('input', val);
-                }
-
-            },
-
-        },
-
-        validations: {
-            parameters: {
-                street_one: { required:requiredIf(function () { return this.computeAddressId === -1 }) },
-                street_two: {},
-                district_id: { required },
-                post_code: { required },
-            }
-        },
-        methods:{
-            submitForm(){
-                if(!this.validate()){
-                    return;
-                }
-                this.isLoading = true;
-                this.isEdit?this.submit(route('api.address.update', this.parameters.id), 'put', this.section, true, true):this.submit((this.route('api.address.create')), 'post', 'addressList', true, true);
-            },
-            successHandler(response){
-                this.$emit('input', response.payload.data.id);
-                this.resetForm();
-                this.closeModal();
-                this.isLoading = false;
-                this.updateList();
-            }
-        }
-    }
-</script>
diff --git a/resources/assets/vue/components/address/elements/AddressComponent.vue b/resources/assets/vue/components/addresses/elements/AddressComponent.vue
similarity index 100%
rename from resources/assets/vue/components/address/elements/AddressComponent.vue
rename to resources/assets/vue/components/addresses/elements/AddressComponent.vue
diff --git a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
new file mode 100644
index 00000000..5c5e1cbe
--- /dev/null
+++ b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
@@ -0,0 +1,135 @@
+<template>
+    <div class="row m-b-10 bg-master-lightest">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row" v-show="!isLoading">
+                <div class="col">
+                    <div class="row align-items-center">
+                        <div class="col p-t-10 p-b-10">
+                            <div class="row">
+                                <div class="col">
+                                    <h5 class="text-primary no-margin"><a :href="route('order.show', item.owner.reference)">{{item.owner.reference}}</a></h5>
+                                </div>
+                            </div>
+                            <div class="row align-items-center">
+                                <div class="col">
+                                    <h6 class="no-margin"><a :href="route('customer.profile', item.owner.company_module.marking)">{{item.owner.company_module.marking}}</a></h6>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row b-t b-grey">
+                        <div class="col p-t-10">
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="fs-8 all-caps muted">Original Address</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="fs-11 bold">{{item.owner.address.street_one+' '+(item.owner.address.street_two ? item.owner.address.street_two : '')+', '+ item.owner.address.district.name+', '+item.owner.address.post_code+' '+item.owner.address.state.name+', '+item.owner.address.country.name}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col">
+                                    <div class="row m-b-5">
+                                        <div class="col">
+                                            <div class="fs-8 all-caps muted">New Address</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="fs-11 bold">{{item.street_one+' '+(item.street_two ? item.street_two : '')+', '+ item.district.name+', '+item.post_code+' '+item.state.name+', '+item.country.name}}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-t-20 parentContainer">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col no-padding">
+                                            <button class="btn btn-md btn-block btn-outline-danger b-rad-none p-t-10 p-b-10 requestModal" data-type="rejectAddress">
+                                                Reject
+                                            </button>
+                                        </div>
+                                        <modal-component small type="rejectAddress">
+                                            <div class="row">
+                                                <div class="col text-center">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row m-b-20">
+                                                                <div class="col">
+                                                                    <h5 class="all-caps">Reject Address Change Request</h5>
+                                                                    <div class="fs-11">Are you sure you want to reject order delivery address change request?</div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col p-r-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                </div>
+                                                                <div class="col p-l-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="approveAddress(6)">Reject</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </modal-component>
+                                        <div class="col no-padding ml-auto">
+                                            <button class="btn btn-md btn-block btn-outline-success b-rad-none p-t-10 p-b-10 requestModal" data-type="approveAddress">
+                                                Approve
+                                            </button>
+                                        </div>
+                                        <modal-component small type="approveAddress">
+                                            <div class="row">
+                                                <div class="col text-center">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row m-b-20">
+                                                                <div class="col">
+                                                                    <h5 class="all-caps">Approve Address Change Request</h5>
+                                                                    <div class="fs-11">Are you sure you want to approve this order delivery address change request?</div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col p-r-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                </div>
+                                                                <div class="col p-l-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="approveAddress(2)">Approve</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </modal-component>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import staticFormHandler from '../../../general/mixins/staticFormHandler'
+    export default {
+        methods: {
+            approveAddress(status){
+                this.isLoading = true;
+                this.submit((this.route('api.order.address.status.update', this.item.id, status)), 'put', 'addressVerificationSection', true, true);
+            },
+        },
+        mixins: [componentHandler, staticFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/addresses/elements/SelectAddressComponent.vue b/resources/assets/vue/components/addresses/elements/SelectAddressComponent.vue
index 587f2394..d3e8daf2 100644
--- a/resources/assets/vue/components/addresses/elements/SelectAddressComponent.vue
+++ b/resources/assets/vue/components/addresses/elements/SelectAddressComponent.vue
@@ -5,10 +5,10 @@
                 <div class="col-auto p-r-0">
                     <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': value !== item.id, 'fa-check-circle': value === item.id, 'text-primary': value === item.id}"></i>
                 </div>
-                <div class="col-2">
+                <div class="col-3">
                     <h6 class="no-margin bold fs-12">{{item.reference}}</h6>
                 </div>
-                <div class="col">
+                <div class="col text-left">
                     <h6 class="no-margin fs-12">{{item.street_one}} {{item.street_two}}, {{item.district.name}}, {{item.post_code}} {{item.state.name}}, {{item.country.name}}</h6>
                 </div>
                 <div class="col-auto">
diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
index 3999ce1d..450fe5aa 100644
--- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
@@ -20,13 +20,13 @@
                         </div>
                     </div>
                     <div class="row m-b-15">
-                        <div class="col-12 col-md pl-md-2 pb-3 pb-md-0 ">
+                        <div class="col-12 col-md p-r-5 pb-3 pb-md-0 ">
                             <validation-wrapper-component selecatable :validator="$v.parameters.district_id">
                                 <label>District</label>
                                 <selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col-12 col-md pl-md-2">
+                        <div class="col-12 col-md p-l-5">
                             <validation-wrapper-component :validator="$v.parameters.post_code">
                                 <label>Post Code</label>
                                 <input class="form-control" name="post_code" v-model="parameters.post_code">
diff --git a/resources/assets/vue/components/address/forms/SetDefaultAddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/SetDefaultAddressFormComponent.vue
similarity index 100%
rename from resources/assets/vue/components/address/forms/SetDefaultAddressFormComponent.vue
rename to resources/assets/vue/components/addresses/forms/SetDefaultAddressFormComponent.vue
diff --git a/resources/assets/vue/components/address/sections/AddressListComponent.vue b/resources/assets/vue/components/addresses/sections/AddressListComponent.vue
similarity index 100%
rename from resources/assets/vue/components/address/sections/AddressListComponent.vue
rename to resources/assets/vue/components/addresses/sections/AddressListComponent.vue
diff --git a/resources/assets/vue/components/companies/elements/CompanyComponent.vue b/resources/assets/vue/components/companies/elements/CompanyComponent.vue
index c0c63716..88c0480c 100644
--- a/resources/assets/vue/components/companies/elements/CompanyComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CompanyComponent.vue
@@ -10,8 +10,9 @@
             <div class="font-heading all-caps fs-11">{{this.item.name}}</div>
             <div class="font-heading all-caps fs-11">CIEF/{{this.item.company_module.marking}}</div>
         </div>
-        <div class="col-auto text-center">
-
+        <div class="col-auto">
+            <div class="font-heading all-caps fs-11">Date</div>
+            <div class="font-heading all-caps fs-11">{{this.item.created_at}}</div>
         </div>
         <div class="col-auto text-center">
             <div class="font-heading all-caps fs-11 p-l-15 p-r-15 p-t-5 p-b-5 bg-master-lighter btn-rounded"><i class="fa fa-circle m-r-10" :class="{'text-danger': item.status !==2,  'text-success': item.status ==2}"></i>{{this.item.status === 2 ? 'Active':'Inactive'}}</div>
diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
new file mode 100644
index 00000000..be480278
--- /dev/null
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -0,0 +1,89 @@
+<template>
+    <div class="row m-b-15">
+        <div class="col b-a b-grey rounded">
+            <div class="row">
+                <div class="col padding-15">
+                    <div class="row align-items-center">
+                        <div class="col-auto p-r-0">
+                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                 width="40" height="40"
+                                 viewBox="0 0 172 172"
+                                 style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M85.96641,12.86641c-1.18418,0.0252 -2.1332,0.99941 -2.11641,2.18359v10.75h-23.65v15.05h-25.8v38.24649l-22.38184,5.42539l11.71582,25.7748l6.12246,32.63633c-1.00781,0.41992 -1.96524,0.89023 -2.87227,1.34375c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-0.90703,-0.45352 -1.86445,-0.92383 -2.87227,-1.34375l6.12246,-32.63633l11.71582,-25.7748l-22.38184,-5.42539v-38.24649h-25.8v-15.05h-23.65v-10.75c0.0084,-0.57949 -0.21836,-1.14219 -0.62988,-1.55371c-0.41152,-0.41152 -0.97422,-0.63828 -1.55371,-0.62988zM64.5,30.1h21.13887c0.23516,0.04199 0.47031,0.04199 0.69707,0h21.16406v10.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15h25.8v32.90508l-47.3,-11.47227l-47.3,11.47227v-32.90508h25.8c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM55.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM64.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM107.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,71.01719l67.91816,16.46094l-9.78418,21.5252l-6.17285,32.92188c-0.11758,-0.0084 -0.23516,-0.0252 -0.36113,-0.0252c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-0.12598,0 -0.24355,0.0168 -0.36113,0.0252l-6.17285,-32.92187l-9.78418,-21.5252zM86,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.54961,90.90469c-0.32754,0.0084 -0.66348,0.05039 -0.99102,0.13438l-4.3,1.075c-1.90645,0.47031 -3.25859,2.20879 -3.25859,4.16562v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031l4.3,-1.075v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531c0,-2.40195 -2.04922,-4.3 -4.35039,-4.3zM120.45039,90.90469c-2.30117,0 -4.35039,1.89805 -4.35039,4.3v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531l4.3,1.075v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67187,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031c0,-1.95684 -1.35215,-3.69531 -3.25859,-4.16562l-4.3,-1.075c-0.32754,-0.08398 -0.66348,-0.12598 -0.99101,-0.13438zM86,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,118.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,135.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM12.9,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM159.1,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                        </div>
+                        <div class="col">
+                            <h6 class="no-margin bold">{{item.container_reference}}</h6>
+                            <p class="no-margin">{{item.container_number}} / {{item.seal_reference}}</p>
+                        </div>
+                        <div class="col-2">
+                            <p class="no-margin fs-10 all-caps">ETD</p>
+                            <p class="no-margin">{{item.transport ? item.transport.current_schedule.etd : 'n/a'}}</p>
+                        </div>
+                        <div class="col-2">
+                            <p class="no-margin fs-10 all-caps">ETA</p>
+                            <p class="no-margin">{{item.transport ? item.transport.current_schedule.eta : 'n/a'}}</p>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Status</p>
+                            <p class="no-margin bold" :class="{'text-success': item.status === 3, 'text-complete': item.status !== 3}">{{item.status === 3 ? 'Un-stuffed' : 'In Progress'}}</p>
+                        </div>
+                        <div class="col-auto">
+                            <div class="btn btn-default no-border" @click="expanded = !expanded">
+                                <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-show="expanded">
+                <div class="col bg-master-lightest">
+                    <div class="row">
+                        <div class="col">
+                            <div class="row align-items-center p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
+                                <div class="col-2">Marking</div>
+                                <div class="col-1 text-center">Quantity</div>
+                                <div class="col-1">CBM</div>
+                                <div class="col-1 text-center">status</div>
+                                <div class="col">Delivery Address</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row align-items-center p-t-10 p-b-10 b-t b-grey" v-for="packingList in item.packing_lists">
+                                        <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a>/<a :href="route('order.show', packingList.order.reference)">{{packingList.order.reference}}</a></div>
+                                        <div class="col-1 text-center">{{packingList.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
+                                        <div class="col-1">{{(Math.round((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</div>
+                                        <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.status === 5 ? 'On Hold' : 'Release'}}</div>
+                                        <div class="col">{{packingList.order.address.street_one+' '+(packingList.order.address.street_two ? packingList.order.address.street_two : '')+', '+ packingList.order.address.district.name+', '+packingList.order.address.post_code+' '+packingList.order.address.state.name+', '+packingList.order.address.country.name}}</div>
+                                        <div class="col-auto" v-if="!packingList.transport">
+                                            <div class="btn btn-xs btn-success pointer" v-if="packingList.status === 5" @click="submit(route('api.packing_list.status.update', packingList.id, item.status === 1 ? 1 : 2), 'put', 'containerListSection', true, true)"><i class="fa fa-check m-r-5"></i>Release</div>
+                                            <div class="btn btn-xs btn-danger pointer" v-if="packingList.status !== 5" @click="submit(route('api.packing_list.status.update', packingList.id, 5), 'put', 'containerListSection', true, true)"><i class="fa fa-hand-paper-o m-r-5"></i>Hold</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                expanded: false
+            }
+        },
+        methods: {
+            successHandler(){
+                this.$store.dispatch('reloadList', {'name': 'containerListSection'});
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/elements/ApproveChangeAddressComponent.vue b/resources/assets/vue/components/orders/elements/ApproveChangeAddressComponent.vue
new file mode 100644
index 00000000..d4217fd5
--- /dev/null
+++ b/resources/assets/vue/components/orders/elements/ApproveChangeAddressComponent.vue
@@ -0,0 +1,22 @@
+<template>
+    <i v-show="data.address_change_request&&$store.getters.isAdmin" class="fa fa-exclamation pointer requestModal"  data-type="approveChangeAddress">
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="approveChangeAddress" size="large">
+            <approve-change-address-form-component :data="data" :section="section" class="text-center"></approve-change-address-form-component>
+        </modal-component>
+    </i>
+</template>
+<script>
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: true,
+            }
+        },
+        data() {
+            return {
+                section:"changeAddressSection"
+            }
+        },
+    }
+</script>
diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index f1465b7c..35d9e52f 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -27,7 +27,7 @@
                                             <p class="no-margin all-caps fs-10 light">Width</p>
                                         </div>
                                         <div class="col-auto b-r b-grey p-t-10 p-b-10">
-                                            <p class="no-margin text-info bold">{{item.quantity}} <sup>CM</sup></p>
+                                            <p class="no-margin text-info bold">{{item.height}} <sup>CM</sup></p>
                                             <p class="no-margin all-caps fs-10 light">Height</p>
                                         </div>
                                         <div class="col-auto b-r b-grey p-t-10 p-b-10">
@@ -52,6 +52,10 @@
                                             <small class="fs-10 all-caps muted">Status</small>
                                             <p class="no-margin bold">{{status}}</p>
                                         </div>
+                                        <div class="col-auto" v-if="$store.getters.isAdmin">
+                                            <small class="fs-10 all-caps muted">Container</small>
+                                            <p class="no-margin bold">{{item.container.container_reference}}</p>
+                                        </div>
                                     </div>
                                     <div class="row">
                                         <div class="col-auto">
diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 74c2be6d..17e29d63 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -38,14 +38,6 @@
             </div>
             <div class="row" v-if="expanded" >
                 <div class="col bg-white p-t-15 p-b-15">
-                    <div class="row m-b-5">
-                        <div class="col-auto p-r-5">
-                            <p class="no-margin all-caps fs-10 light">Order Number</p>
-                        </div>
-                        <div class="col p-l-5">
-                            <p class="no-margin bold text-info fs-12">{{item.order.reference}}</p>
-                        </div>
-                    </div>
                     <div class="row m-b-5">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Description</p>
@@ -62,6 +54,30 @@
                             <p class="no-margin bold text-info fs-12">{{item.transport.tracking_number}}</p>
                         </div>
                     </div>
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                        <div class="col-auto p-r-5">
+                            <p class="no-margin all-caps fs-10 light">Marking</p>
+                        </div>
+                        <div class="col p-l-5">
+                            <p class="no-margin bold text-info fs-12"><a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a></p>
+                        </div>
+                    </div>
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                        <div class="col-auto p-r-5">
+                            <p class="no-margin all-caps fs-10 light">Order Number</p>
+                        </div>
+                        <div class="col p-l-5">
+                            <p class="no-margin bold text-info fs-12"><a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></p>
+                        </div>
+                    </div>
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                        <div class="col-auto p-r-5">
+                            <p class="no-margin all-caps fs-10 light">Delivery Address</p>
+                        </div>
+                        <div class="col p-l-5">
+                            <p class="no-margin bold text-info fs-12">{{item.order.address.street_one+' '+(item.order.address.street_two ? item.order.address.street_two : '')+', '+ item.order.address.district.name+', '+item.order.address.post_code+' '+item.order.address.state.name+', '+item.order.address.country.name}}</p>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/resources/assets/vue/components/orders/forms/ApproveChangeAddressFormComponent.vue b/resources/assets/vue/components/orders/forms/ApproveChangeAddressFormComponent.vue
new file mode 100644
index 00000000..ce9f4769
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/ApproveChangeAddressFormComponent.vue
@@ -0,0 +1,49 @@
+<template>
+    <div class="row justify-content-center">
+        <div class="col col-md-10">
+            <div class="row m-b-20">
+                <div class="col">
+                    <div class="row m-b-20 text-info">
+                        <div class="col text-center">
+                            <h3>Approve</h3>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row justify-content-center animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
+                <div class="col col-md-8 no-padding">
+                    <div class="row">
+                        <div class="col p-l-5">
+                            <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="approveChangeAddress()" >Approve</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: true,
+            }
+        },
+        data() {
+            return {
+                parameters : {
+                    order_id: this.data.id,
+                }
+            }
+        },
+        methods:{
+            approveChangeAddress(){
+                this.submit((this.route('api.order.address.change.approve')), 'post', 'orderListSection', true, true);
+            },
+        },
+        mixins: [componentHandler, ModalFormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
new file mode 100644
index 00000000..b138b680
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
@@ -0,0 +1,84 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-20 text-info">
+                        <div class="col">
+                            <h3 class="text-left">Delivery Address Update</h3>
+                            <h6 class="text-left">Please select the address where you want to receive this order</h6>
+                        </div>
+                    </div>
+                    <div class="row justify-content-center no-margin">
+                        <div class="col">
+                            <list-component style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 10, HasMorphCompanyModule: data.company_module.id}">
+                                <template slot="list" slot-scope="{data}">
+                                    <select-address-component :data="data" :value="parameters.address_id" v-model="parameters.address_id"></select-address-component>
+                                </template>
+                            </list-component>
+                            <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
+                                <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.address_id, 'b-grey': parameters.address_id}" @click="parameters.address_id = null">
+                                    <div class="row align-items-center">
+                                        <div class="col-auto p-r-0">
+                                            <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.address_id, 'fa-check-circle': !parameters.address_id, 'text-primary': !parameters.address_id}"></i>
+                                        </div>
+                                        <div class="col-auto semi-bold">New Address</div>
+                                    </div>
+                                    <div class="row" v-show="!parameters.address_id">
+                                        <div class="col">
+                                            <address-form-component :id="data.company_module.id" section="addressList" @input="parameters.address_id = $event"></address-form-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row animate__animated animate__fadeInUpBig animate__delay-1 animate__fast no-margin">
+                <div class="col no-padding">
+                    <div class="row">
+                        <div class="col"></div>
+                        <div class="col-7">
+                            <h6 class="text-right fs-12 text-danger m-b-15 text-right">**You delivery address change request will be approved after being reviewed, once it's approved your order delivery address will be updated.</h6>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col text-left">
+                            <button type="button" class="btn btn-md btn-default b-rad-none pointer" data-dismiss="modal" >Cancel</button>
+                        </div>
+                        <div class="col-auto">
+                            <button type="button" class="btn btn-md btn-block btn-primary b-rad-none" @click="changeAddress()" v-if="parameters.address_id">Update Delivery Address</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        props: {
+            data: {
+                type: Object,
+                required: true,
+            }
+        },
+        data() {
+            return {
+                parameters : {
+                    address_id: '',
+                    order_id: this.data.id,
+                }
+            }
+        },
+        methods:{
+            changeAddress(){
+                this.submit((this.route('api.order.address.change.request')), 'post', 'orderListSection', true, true);
+            },
+        },
+        mixins: [componentHandler, ModalFormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 84525c41..22215504 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -16,29 +16,71 @@
                             </div>
                         </div>
                         <div class="col">
-                            <div class="row m-b-10">
+                            <div class="row m-b-20">
                                 <div class="col">
                                     <h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
                                 </div>
                             </div>
-                            <div class="row m-b-10">
+                            <div class="row m-b-20">
                                 <div class="col-auto">
-                                    <h6 class="no-margin"><b>Delivery Address:</b> {{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i></h6>
+                                    <h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
                                 </div>
                                 <div class="col-auto">
                                     <h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.id === 3 ? 'Guang Zhou' : 'Yiwu'}}</h6>
                                 </div>
-                                <div class="col-auto">
-                                    <h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
-                                </div>
-                            </div>
-                            <div class="row m-b-10" v-if="$store.getters.isAdmin">
-                                <div class="col" >
+                                <div class="col" v-if="$store.getters.isAdmin">
                                     <a :href="route('customer.profile', order.company_module.marking)">
                                         <h6 class="no-margin"><b>Customer Marking:</b> {{order.company_module.marking}}</h6>
                                     </a>
                                 </div>
                             </div>
+                            <div class="row m-b-10 align-items-center parentContainer" >
+                                <div class="col-auto">
+                                    <h6 class="no-margin"><b>Delivery Address:</b> {{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i></h6>
+                                </div>
+                                <div class="col">
+                                    <div class="row" v-if="!order.address_change_request">
+                                        <div class="col">
+                                            <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal"  data-type="updateDeliveryAddress">Change Delivery Address</div>
+                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="updateDeliveryAddress" size="large">
+                                                <change-order-address-form-component :data="order" :section="section" class="text-center"></change-order-address-form-component>
+                                            </modal-component>
+                                        </div>
+                                    </div>
+                                    <div class="row parentContainer" v-if="order.address_change_request">
+                                        <div class="col-auto p-r-0">
+                                            <div class="p-t-10 p-b-10 p-l-15 p-r-15 b-a b-danger fs-10 text-danger requestModal"  data-type="updateDeliveryAddress"><i class="fa fa-exclamation-circle m-r-10"></i>Your Delivery address change request is being reviewed</div>
+                                        </div>
+                                        <div class="col-auto bg-danger-light pointer requestModal" data-type="cancelAddressChangeRequest">
+                                            <i class="fa fa-times text-white lh-38"></i>
+                                        </div>
+                                        <modal-component small type="cancelAddressChangeRequest">
+                                            <div class="row">
+                                                <div class="col text-center">
+                                                    <div class="row">
+                                                        <div class="col text-center">
+                                                            <div class="row m-b-20">
+                                                                <div class="col">
+                                                                    <h5 class="all-caps">Cancel Address Change Request</h5>
+                                                                    <div class="fs-11">Are you sure you want to cancel your order delivery address change request?</div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="row">
+                                                                <div class="col p-r-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                                                                </div>
+                                                                <div class="col p-l-5">
+                                                                    <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.order.address.status.update', order.address_change_request.id, 6), 'put', section, true, true)">Confirm</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </modal-component>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="row align-items-center">
                                 <div class="col-10">
                                     <h6 class="text-info"><span class="text-danger bold">Gentle reminder:</span> You need to send the QR code to your supplier to print and stick on your packages, this QR code is required for us to identify your packages when they arrives at our warehouse!</h6>
diff --git a/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue b/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
deleted file mode 100644
index a56afe24..00000000
--- a/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-    <div class="row">
-        <div class="col-5">
-            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
-                <template slot="list" slot-scope="{data}">
-
-                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
-                </template>
-            </list-component>
-        </div>
-    </div>
-</template>
\ No newline at end of file
diff --git a/resources/views/layouts/base_portal.blade.php b/resources/views/layouts/base_portal.blade.php
index 452d1560..87144464 100644
--- a/resources/views/layouts/base_portal.blade.php
+++ b/resources/views/layouts/base_portal.blade.php
@@ -19,6 +19,12 @@
                                     @include('partials.header')
                                     <div class="row no-margin p-b-50">
                                         <div class="col p-t-15 p-b-25">
+                                            <div class="row m-b-20" v-if="$store.getters.isAdmin">
+                                                <div class="col"></div>
+                                                <div class="col-auto p-r-0">
+                                                    <a href="{{route('orders.refresh')}}"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>
+                                                </div>
+                                            </div>
                                             @yield('inner_content')
                                         </div>
                                     </div>
diff --git a/resources/views/pages/admin/dashboard.blade.php b/resources/views/pages/admin/dashboard.blade.php
index 431120dc..0fe49ba7 100644
--- a/resources/views/pages/admin/dashboard.blade.php
+++ b/resources/views/pages/admin/dashboard.blade.php
@@ -1,5 +1,5 @@
 <div class="row d-none" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin">
-    <div class="col-6">
+    <div class="col-8">
         <div class="row p-b-5 b-b b-grey m-b-10 m-l-0 m-r-0">
             <div class="col no-padding">
                 <h6>Customers List</h6>
@@ -30,5 +30,19 @@
                 </list-component>
             </div>
         </div>
+        <div class="row p-b-5 b-b b-grey m-b-10 m-l-0 m-r-0">
+            <div class="col no-padding">
+                <h6>Address Change Verification</h6>
+            </div>
+        </div>
+        <div class="row no-margin">
+            <div class="col">
+                <list-component key="2" section="addressVerificationSection" :options="{'per_page': 5, 'status': 1, 'with_owner': true}"  :endpoint="route('api.address.list')">
+                    <template slot="list" slot-scope="{data}">
+                        <address-verification-component section="addressVerificationSection" :data="data"></address-verification-component>
+                    </template>
+                </list-component>
+            </div>
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/pages/containers.blade.php b/resources/views/pages/containers.blade.php
new file mode 100644
index 00000000..6c2eb286
--- /dev/null
+++ b/resources/views/pages/containers.blade.php
@@ -0,0 +1,17 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+<div class="row m-1 mt-3 mb-3 hide">
+    <div class="col col-10 m-r-5">
+        <div class="row border p-1">Search</div>
+    </div>
+    <div class="col col m-l-5">
+        <div class="row border p-1">Filter</div>
+    </div>
+</div>
+<!-- <list-component  section="containerListSection" :endpoint="route('api.packing_list.container.list')"> -->
+<list-component  section="containerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'with_packing_lists': true, order_by: {column: 'created_at', DESC: true}}">
+    <template slot="list" slot-scope="{data}">
+        <container-component :data="data"></container-component>
+    </template>
+</list-component>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/templates/containers.blade.php b/resources/views/pages/templates/containers.blade.php
new file mode 100644
index 00000000..995e7b93
--- /dev/null
+++ b/resources/views/pages/templates/containers.blade.php
@@ -0,0 +1,17 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+<div class="row m-1 mt-3 mb-3 hide">
+    <div class="col col-10 m-r-5">
+        <div class="row border p-1">Search</div>
+    </div>
+    <div class="col col m-l-5">
+        <div class="row border p-1">Filter</div>
+    </div>
+</div>
+<!-- <list-component  section="containerListSection" :endpoint="route('api.packing_list.container.list')"> -->
+<list-component  section="containerListSection" :endpoint="route('api.address.district.list')">
+    <template slot="list" slot-scope="{data}">
+        <container-component :data="data"></container-component>
+    </template>
+</list-component>
+@endsection
\ No newline at end of file
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index b12f825a..a57fc834 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -1,4 +1,12 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-   <warehouse-list-section-component></warehouse-list-section-component>
+    <div class="row">
+        <div class="col-7">
+            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: true}}">
+                <template slot="list" slot-scope="{data}">
+                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
+                </template>
+            </list-component>
+        </div>
+    </div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index 467daf85..f6af1f1e 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -52,6 +52,17 @@
                                 <a href="{{route('warehouse.list')}}"><h6 class="no-margin light fs-18 all-caps">Arrived Parcels</h6></a>
                             </div>
                         </div>
+                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center" v-if="$store.getters.isAdmin">
+                            <div class="col-auto p-r-0">
+                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                     width="25" height="25"
+                                     viewBox="0 0 172 172"
+                                     style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M85.96641,12.86641c-1.18418,0.0252 -2.1332,0.99941 -2.11641,2.18359v10.75h-23.65v15.05h-25.8v38.24649l-22.38184,5.42539l11.71582,25.7748l6.12246,32.63633c-1.00781,0.41992 -1.96524,0.89023 -2.87227,1.34375c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-0.90703,-0.45352 -1.86445,-0.92383 -2.87227,-1.34375l6.12246,-32.63633l11.71582,-25.7748l-22.38184,-5.42539v-38.24649h-25.8v-15.05h-23.65v-10.75c0.0084,-0.57949 -0.21836,-1.14219 -0.62988,-1.55371c-0.41152,-0.41152 -0.97422,-0.63828 -1.55371,-0.62988zM64.5,30.1h21.13887c0.23516,0.04199 0.47031,0.04199 0.69707,0h21.16406v10.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15h25.8v32.90508l-47.3,-11.47227l-47.3,11.47227v-32.90508h25.8c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM55.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM64.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM107.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,71.01719l67.91816,16.46094l-9.78418,21.5252l-6.17285,32.92188c-0.11758,-0.0084 -0.23516,-0.0252 -0.36113,-0.0252c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-0.12598,0 -0.24355,0.0168 -0.36113,0.0252l-6.17285,-32.92187l-9.78418,-21.5252zM86,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.54961,90.90469c-0.32754,0.0084 -0.66348,0.05039 -0.99102,0.13438l-4.3,1.075c-1.90645,0.47031 -3.25859,2.20879 -3.25859,4.16562v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031l4.3,-1.075v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531c0,-2.40195 -2.04922,-4.3 -4.35039,-4.3zM120.45039,90.90469c-2.30117,0 -4.35039,1.89805 -4.35039,4.3v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531l4.3,1.075v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67187,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031c0,-1.95684 -1.35215,-3.69531 -3.25859,-4.16562l-4.3,-1.075c-0.32754,-0.08398 -0.66348,-0.12598 -0.99101,-0.13438zM86,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,118.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,135.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM12.9,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM159.1,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                            </div>
+                            <div class="col">
+                                <a href="{{route('containers')}}"><h6 class="no-margin light fs-18 all-caps">Containers</h6></a>
+                            </div>
+                        </div>
                         <div class="row p-t-15 p-b-15 align-items-center justify-content-center hide">
                             <div class="col-auto p-r-0">
                                 <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
diff --git a/resources/views/swagger/json.blade.php b/resources/views/swagger/json.blade.php
index 1e09fa9c..4fa056ef 100644
--- a/resources/views/swagger/json.blade.php
+++ b/resources/views/swagger/json.blade.php
@@ -28,13 +28,17 @@
       "name": "Order",
       "description": "Endpoints related to order module."
     },
+    {
+      "name": "Packing",
+      "description": "Endpoints related to packing module."
+    },
     {
       "name": "Package",
       "description": "Endpoints related to package module."
     },
     {
-      "name": "Packing",
-      "description": "Endpoints related to packing module."
+      "name": "Container",
+      "description": "Endpoints related to container module."
     },
     {
       "name": "Transport",
@@ -71,9 +75,9 @@
         "description": "",
         "parameters": [
           {
-            "name": "package_id",
+            "name": "reference_number",
             "in": "query",
-            "description": "Package Id",
+            "description": "Reference No",
             "required": true,
             "type": "integer"
           }
@@ -221,7 +225,7 @@
             "description": "Status",
             "required": true,
             "type": "integer"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -296,7 +300,7 @@
     "/packing_list/container/create": {
       "post": {
         "tags": [
-          "Packing"
+          "Container"
         ],
         "produces": [
           "application/json"
@@ -362,7 +366,7 @@
     "/packing_list/container/list": {
       "get": {
         "tags": [
-          "Packing"
+          "Container"
         ],
         "produces": [
           "application/json"
@@ -410,7 +414,7 @@
     "/packing_list/container/{id}/show": {
       "get": {
         "tags": [
-          "Packing"
+          "Container"
         ],
         "produces": [
           "application/json"
@@ -455,7 +459,7 @@
     "/packing_list/container/update/{id}": {
       "put": {
         "tags": [
-          "Packing"
+          "Container"
         ],
         "produces": [
           "application/json"
@@ -528,7 +532,7 @@
     "/packing_list/container/delete/{id}": {
       "delete": {
         "tags": [
-          "Packing"
+          "Container"
         ],
         "produces": [
           "application/json"
@@ -826,7 +830,7 @@
         }
       }
     },
-    "/package/create": {
+    "/packing_list/package/create": {
       "post": {
         "tags": [
           "Package"
@@ -893,7 +897,7 @@
             "description": "Quantity",
             "required": true,
             "type": "integer"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -920,7 +924,7 @@
         }
       }
     },
-    "/package/list": {
+    "/packing_list/package/list": {
       "get": {
         "tags": [
           "Package"
@@ -968,7 +972,7 @@
         }
       }
     },
-    "/package/{id}/show": {
+    "/packing_list/package/{id}/show": {
       "get": {
         "tags": [
           "Package"
@@ -1013,7 +1017,7 @@
         }
       }
     },
-    "/package/update/{id}": {
+    "/packing_list/package/update/{id}": {
       "put": {
         "tags": [
           "Package"
@@ -1087,7 +1091,7 @@
             "description": "Status",
             "required": true,
             "type": "integer"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -1114,7 +1118,7 @@
         }
       }
     },
-    "/package/delete/{id}": {
+    "/packing_list/package/delete/{id}": {
       "delete": {
         "tags": [
           "Package"
@@ -1159,7 +1163,7 @@
         }
       }
     },
-    "/package/item/create": {
+    "/packing_list/package/item/create": {
       "post": {
         "tags": [
           "Package"
@@ -1219,7 +1223,7 @@
             "description": "Total",
             "required": true,
             "type": "number"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -1246,7 +1250,7 @@
         }
       }
     },
-    "/package/item/list": {
+    "/packing_list/package/item/list": {
       "get": {
         "tags": [
           "Package"
@@ -1294,7 +1298,7 @@
         }
       }
     },
-    "/package/item/{id}/show": {
+    "/packing_list/package/item/{id}/show": {
       "get": {
         "tags": [
           "Package"
@@ -1339,7 +1343,7 @@
         }
       }
     },
-    "/package/item/update/{id}": {
+    "/packing_list/package/item/update/{id}": {
       "put": {
         "tags": [
           "Package"
@@ -1406,7 +1410,7 @@
             "description": "Status",
             "required": true,
             "type": "integer"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -1433,7 +1437,7 @@
         }
       }
     },
-    "/package/item/delete/{id}": {
+    "/packing_list/package/item/delete/{id}": {
       "delete": {
         "tags": [
           "Package"
@@ -1490,7 +1494,7 @@
         "summary": "Create transport",
         "description": "",
         "parameters": [
-         {
+          {
             "name": "container_id",
             "in": "query",
             "description": "Container Id",
@@ -1697,7 +1701,7 @@
             "description": "Status",
             "required": true,
             "type": "integer"
-          },
+          }
         ],
         "responses": {
           "200": {
@@ -2294,9 +2298,9 @@
         "description": "",
         "parameters": [
           {
-            "name": "company_module_id",
+            "name": "company_id",
             "in": "query",
-            "description": "Company Module ID",
+            "description": "Company ID",
             "required": true,
             "type": "integer"
           },
@@ -2430,6 +2434,148 @@
         }
       }
     },
+    "/order/show/{id}": {
+      "get": {
+        "tags": [
+          "Order"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "operationId": "showOrder",
+        "summary": "Show order",
+        "description": "",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Order Reference Id",
+            "required": true,
+            "type": "integer"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "headers": {
+              "X-Expires-After": {
+                "type": "string",
+                "format": "date-time",
+                "description": "date in UTC when token expires"
+              },
+              "X-Rate-Limit": {
+                "type": "integer",
+                "format": "int32",
+                "description": "calls per hour allowed by the user"
+              }
+            },
+            "schema": {
+              "type": "string"
+            }
+          },
+          "422": {
+            "description": "Invalid input supplied"
+          }
+        }
+      }
+    },
+    "/order/address/change/request": {
+      "post": {
+        "tags": [
+          "Order"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "operationId": "requestChangeOrderAddress",
+        "summary": "Request Change Order Address",
+        "description": "",
+        "parameters": [
+          {
+            "name": "order_id",
+            "in": "query",
+            "description": "Order ID",
+            "required": true,
+            "type": "integer"
+          },
+          {
+            "name": "address_id",
+            "in": "query",
+            "description": "New Order Address ID",
+            "required": true,
+            "type": "integer"
+          },
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "headers": {
+              "X-Expires-After": {
+                "type": "string",
+                "format": "date-time",
+                "description": "date in UTC when token expires"
+              },
+              "X-Rate-Limit": {
+                "type": "integer",
+                "format": "int32",
+                "description": "calls per hour allowed by the user"
+              }
+            },
+            "schema": {
+              "type": "string"
+            }
+          },
+          "422": {
+            "description": "Invalid input supplied"
+          }
+        }
+      }
+    },
+    "/order/address/change/approve": {
+      "post": {
+        "tags": [
+          "Order"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "operationId": "approveChangeOrderAddress",
+        "summary": "Approve Change Order Address",
+        "description": "",
+        "parameters": [
+          {
+            "name": "order_id",
+            "in": "query",
+            "description": "Order ID",
+            "required": true,
+            "type": "integer"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "headers": {
+              "X-Expires-After": {
+                "type": "string",
+                "format": "date-time",
+                "description": "date in UTC when token expires"
+              },
+              "X-Rate-Limit": {
+                "type": "integer",
+                "format": "int32",
+                "description": "calls per hour allowed by the user"
+              }
+            },
+            "schema": {
+              "type": "string"
+            }
+          },
+          "422": {
+            "description": "Invalid input supplied"
+          }
+        }
+      }
+    },
     "/address/create": {
       "post": {
         "tags": [
diff --git a/routes/order.php b/routes/order.php
index 4f31ecff..6a0c04d3 100644
--- a/routes/order.php
+++ b/routes/order.php
@@ -9,4 +9,6 @@ Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], f
     Route::put('/confirm/{id}', 'ConfirmOrderController@confirm')->name('confirm');
     Route::put('/cancel/{id}', 'CancelOrderController@cancel')->name('cancel');
     Route::put('/restore/{id}', 'RestoreOrderController@restore')->name('restore');
+    Route::post('/address/change/request', 'RequestChangeOrderAddressController@request')->name('address.change.request');
+    Route::put('/address/{id}/status/{status}', 'ApproveChangeOrderAddressController@approve')->name('address.status.update');
 });
diff --git a/routes/packing_list.php b/routes/packing_list.php
index 06b11950..ea64c7e1 100644
--- a/routes/packing_list.php
+++ b/routes/packing_list.php
@@ -7,6 +7,7 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
     Route::get('/list', 'ListPackingListsController@list')->name('list');
     Route::post('/create', 'CreatePackingListController@create')->name('create');
     Route::put('/update/{id}', 'UpdatePackingListController@update')->name('update');
+    Route::put('/status/{id}/update/{status}', 'UpdatePackingListStatusController@update')->name('status.update');
     Route::delete('/delete/{id}', 'DeletePackingListController@delete')->name('delete');
 
     Route::group(['namespace' => 'Containers', 'prefix' => 'container', 'as' => 'container.'], function () {
diff --git a/routes/web.php b/routes/web.php
index 17b46032..2eb2bcbb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,10 +1,11 @@
 <?php
 
-use App\Classes\General\Services\GeneratesInitials;
+use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
+use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
+use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
+use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
+use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use App\Models\CompanyConnection;
-use App\Models\OldCompany;
-use App\Models\Order;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -65,23 +66,53 @@ Route::get('/warehouse-list', function () {
     return view('pages.warehouse_list');
 })->name('warehouse.list');
 
+Route::get('/containers', function () {
+    return view('pages.containers');
+})->name('containers');
+
 Route::get('/customer/{marking}', function ($marking) {
     $connection = CompanyConnection::where('invitee_reference', $marking)->first();
     $id = $connection->invitee->company->id;
     return view('pages.customers.profile', ['id' => $id]);
 })->name('customer.profile');
 
+Route::get('/orders/refresh', function(){
+
+    FetchWarehouseReceiveListFromVTPortalJob::withChain([
+        new FetchLoadedContainersFromVTPortalJob,
+        new FetchPackingListFromVTPortalJob,
+        new FetchContainersStatusUpdateFromVTPortalJob,
+        new FetchDeliveryListFromVTPortalJob
+    ])->dispatch();
+
+    return redirect('orders');
+
+})->name('orders.refresh');
+
+Route::get('/containers/refresh', function(){
+
+    FetchContainersStatusUpdateFromVTPortalJob::dispatch();
+
+    return redirect('orders');
+
+})->name('containers.refresh');
+
+Route::get('/deliveries/refresh', function(){
+
+    FetchDeliveryListFromVTPortalJob::dispatch();
+
+    return redirect('orders');
+
+})->name('deliveries.refresh');
+
 Route::get('/order/{id}/download', 'Orders\DownloadOrderQrPdfController@download')->name('order.qr.download');
 
-Route::get('/test', function(){
-    $addresses = \App\Models\Address::all();
-    foreach ($addresses as $address){
-        $address->street_one = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_one, $address->district, $address->postcode);
-        $address->street_two = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_two, $address->district, $address->postcode);
-        $address->save();
-    }
-})->name('test');
+//Route::get('/test', function(){
+//    $addresses = \App\Models\Address::all();
+//    foreach ($addresses as $address){
+//        $address->street_one = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_one, $address->district, $address->postcode);
+//        $address->street_two = (new \App\Classes\Modules\Addresses\Services\CleansOldAddress())->cleanAddress($address->street_two, $address->district, $address->postcode);
+//        $address->save();
+//    }
+//})->name('test');
 
-Route::get('/shipping-queue', function () {
-    return view('pages.templates.shippingQueue');
-})->name('shipping-queue');
\ No newline at end of file