diff --git a/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php b/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php
index 1252efe9..884eda4d 100644
--- a/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/CreateOrderProcessor.php
@@ -32,13 +32,12 @@ class CreateOrderProcessor
 
     public function execute(Request $request){
 
-        //TODO: Generate internal reference number
-        //faker->numberBetween(1000000, 9999999),
+        $reference_no = rand(1000000, 9999999);
 
         //TODO: Call Unity to create contract and get contract reference no (and all the obligations)
         //$contract_reference_no = 99;
 
-        $order_object = new OrderObject($request->get('company_module_id'), $request->get('reference'), '', OrderType::SHARED_CONTAINER, OrderStatus::PROCESSING, OrderSteps::PROCESSING);
+        $order_object = new OrderObject($request->get('company_module_id'), $reference_no, '', OrderType::SHARED_CONTAINER, OrderStatus::PROCESSING, OrderSteps::PROCESSING);
 
         $this->canCreateOrder->passes($order_object);
 
diff --git a/app/Classes/Modules/Packages/DataTransferObjects/PackageItemObject.php b/app/Classes/Modules/Packages/DataTransferObjects/PackageItemObject.php
new file mode 100644
index 00000000..27a404e0
--- /dev/null
+++ b/app/Classes/Modules/Packages/DataTransferObjects/PackageItemObject.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Packages\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class PackageItemObject implements DataTransferObject
+{
+
+    private $packageId;
+
+    private $name;
+
+    private $reference;
+
+    private $description;
+
+    private $quantity;
+
+    private $uom;
+
+    private $price;
+
+    private $total;
+
+    private $status;
+
+    public function __construct(int $packageId, ?string $name, ?string $reference, ?string $description, int $quantity, ?string $uom, double $price, double $total, int $status)
+    {
+        $this->packageId = $packageId;
+        $this->name = $name;
+        $this->reference = $reference;
+        $this->description = $description;
+        $this->quantity = $quantity;
+        $this->uom = $uom;
+        $this->price = $price;
+        $this->total = $total;
+        $this->status = $status;
+    }
+
+    public function getPackageId(): int
+    {
+        return $this->packageId;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+
+    public function getReference(): ?string
+    {
+        return $this->reference;
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
+
+    public function getQuantity(): int
+    {
+        return $this->quantity;
+    }
+
+    public function getUom(): ?string
+    {
+        return $this->uom;
+    }
+
+    public function getPrice(): double
+    {
+        return $this->price;
+    }
+
+    public function getTotal(): double
+    {
+        return $this->total;
+    }
+
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+}
diff --git a/app/Classes/Modules/Packages/DataTransferObjects/PackageObject.php b/app/Classes/Modules/Packages/DataTransferObjects/PackageObject.php
index ae6112c1..1c0572dc 100644
--- a/app/Classes/Modules/Packages/DataTransferObjects/PackageObject.php
+++ b/app/Classes/Modules/Packages/DataTransferObjects/PackageObject.php
@@ -7,90 +7,81 @@ use App\Classes\General\Interfaces\DataTransferObject;
 class PackageObject implements DataTransferObject
 {
 
-    /** @var string */
-    private $streetOne;
+    private $orderId;
 
-    /** @var string|null */
-    private $streetTwo;
+    private $claimantId;
 
-    /** @var int */
-    private $countryId;
+    private $type;
 
-    /** @var int */
-    private $stateId;
+    private $description;
 
-    /** @var int */
-    private $districtId;
+    private $width;
 
-    /** @var int */
-    private $postCode;
+    private $height;
 
-    /**
-     * PackageObject constructor.
-     * @param string $streetOne
-     * @param null|string $streetTwo
-     * @param int $countryId
-     * @param int $stateId
-     * @param int $districtId
-     * @param int $postCode
-     */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode)
+    private $length;
+
+    private $weight;
+
+    private $quantity;
+
+    private $status;
+
+    public function __construct(int $orderId, ?int $claimantId, int $type, double $width, double $height, double $length, double $weight, int $quantity, int $status)
     {
-        $this->streetOne = $streetOne;
-        $this->streetTwo = $streetTwo;
-        $this->countryId = $countryId;
-        $this->stateId = $stateId;
-        $this->districtId = $districtId;
-        $this->postCode = $postCode;
+        $this->orderId = $orderId;
+        $this->claimantId = $claimantId;
+        $this->type = $type;
+        $this->width = $width;
+        $this->height = $height;
+        $this->length = $length;
+        $this->weight = $weight;
+        $this->quantity = $quantity;
+        $this->status = $status;
     }
 
-    /**
-     * @return string
-     */
-    public function getStreetOne(): string
+    public function getOrderId(): int
     {
-        return $this->streetOne;
+        return $this->orderId;
     }
 
-    /**
-     * @return null|string
-     */
-    public function getStreetTwo(): ?string
+    public function getClaimantId(): ?int
     {
-        return $this->streetTwo;
+        return $this->claimantId;
     }
 
-    /**
-     * @return int
-     */
-    public function getCountryId(): int
+    public function getType(): int
     {
-        return $this->countryId;
+        return $this->type;
     }
 
-    /**
-     * @return int
-     */
-    public function getStateId(): int
+    public function getWidth(): double
     {
-        return $this->stateId;
+        return $this->width;
     }
 
-    /**
-     * @return int
-     */
-    public function getDistrictId(): int
+    public function getHeight(): double
     {
-        return $this->districtId;
+        return $this->height;
     }
 
-    /**
-     * @return int
-     */
-    public function getPostCode(): int
+    public function getLength(): double
     {
-        return $this->postCode;
+        return $this->length;
     }
 
+    public function getWeight(): double
+    {
+        return $this->weight;
+    }
 
+    public function getQuantity(): int
+    {
+        return $this->quantity;
+    }
+
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
 }
diff --git a/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerPackingListObject.php b/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerPackingListObject.php
new file mode 100644
index 00000000..9d1298c7
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/DataTransferObjects/ContainerPackingListObject.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class PackingListObject implements DataTransferObject
+{
+
+    private $packingListId;
+
+    private $containerReference;
+
+    private $containerType;
+
+    public function __construct(int $packingListId, ?string $containerReference, int $containerType)
+    {
+        $this->packingListId = $packingListId;
+        $this->containerReference = $containerReference;
+        $this->containerType = $containerType
+    }
+
+    public function getPackingListId(): int
+    {
+        return $this->packingListId;
+    }
+
+    public function getContainerReference(): ?string
+    {
+        return $this->containerReference;
+    }
+
+    public function getContainerType(): int
+    {
+        return $this->containerType;
+    }
+}
diff --git a/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php b/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php
index 8410d893..c0dbe006 100644
--- a/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php
+++ b/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php
@@ -7,90 +7,24 @@ use App\Classes\General\Interfaces\DataTransferObject;
 class PackingListObject implements DataTransferObject
 {
 
-    /** @var string */
-    private $streetOne;
+    private $reference;
 
-    /** @var string|null */
-    private $streetTwo;
+    private $status;
 
-    /** @var int */
-    private $countryId;
-
-    /** @var int */
-    private $stateId;
-
-    /** @var int */
-    private $districtId;
-
-    /** @var int */
-    private $postCode;
-
-    /**
-     * PackingListObject constructor.
-     * @param string $streetOne
-     * @param null|string $streetTwo
-     * @param int $countryId
-     * @param int $stateId
-     * @param int $districtId
-     * @param int $postCode
-     */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode)
+    public function __construct(?string $reference, int $status)
     {
-        $this->streetOne = $streetOne;
-        $this->streetTwo = $streetTwo;
-        $this->countryId = $countryId;
-        $this->stateId = $stateId;
-        $this->districtId = $districtId;
-        $this->postCode = $postCode;
+        $this->reference = $reference;
+        $this->status = $status;
     }
 
-    /**
-     * @return string
-     */
-    public function getStreetOne(): string
+    public function getReference(): ?string
     {
-        return $this->streetOne;
+        return $this->reference;
     }
 
-    /**
-     * @return null|string
-     */
-    public function getStreetTwo(): ?string
+    public function getStatus(): int
     {
-        return $this->streetTwo;
+        return $this->status;
     }
 
-    /**
-     * @return int
-     */
-    public function getCountryId(): int
-    {
-        return $this->countryId;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStateId(): int
-    {
-        return $this->stateId;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDistrictId(): int
-    {
-        return $this->districtId;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPostCode(): int
-    {
-        return $this->postCode;
-    }
-
-
 }
diff --git a/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListPackageObject.php b/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListPackageObject.php
new file mode 100644
index 00000000..bf663f77
--- /dev/null
+++ b/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListPackageObject.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class PackingListObject implements DataTransferObject
+{
+
+    private $packingListId;
+
+    private $packageId;
+
+    public function __construct(int $packingListId, int $packageId)
+    {
+        $this->packingListId = $packingListId;
+        $this->packageId = $packageId;
+    }
+
+    public function getPackingListId(): int
+    {
+        return $this->packingListId;
+    }
+
+    public function getPackageId(): int
+    {
+        return $this->packageId;
+    }
+
+}
diff --git a/app/Classes/Modules/Remarks/ControllersLogic/CreateRemarkLogic.php b/app/Classes/Modules/Remarks/ControllersLogic/CreateRemarkLogic.php
index 81aa054b..a5bf50b0 100644
--- a/app/Classes/Modules/Remarks/ControllersLogic/CreateRemarkLogic.php
+++ b/app/Classes/Modules/Remarks/ControllersLogic/CreateRemarkLogic.php
@@ -57,11 +57,11 @@ class CreateRemarkLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
 
-        $object = new RemarkObject($request->input('comment'), $request->input('commenter_id'));
+        $object = new RemarkObject($request->input('content'), $request->input('commenter_id'));
 
         $this->canCreateRemark->passes($object);
 
-        $query = $this->createsRemark->execute($this->fetches->execute(['id' => $request->input('commenter_id')]), $object);
+        $query = $this->createsRemark->execute($this->fetchesUser->execute(['id' => $request->input('commenter_id')]), $object);
 
         return $this->resourceResponse(new RemarkResource($query));
 
diff --git a/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php b/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php
index 0649c857..3ddaebcd 100644
--- a/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php
+++ b/app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php
@@ -2,11 +2,9 @@
 
 namespace App\Classes\Modules\Remarks\ControllersLogic;
 
-
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Remarks\Services\UpdatesRemark;
 use App\Classes\Modules\Remarks\Services\FetchesRemark;
-use App\Classes\Modules\Remarks\Services\FetchesDistrict;
 use App\Classes\Modules\Remarks\Standards\Rules\CanUpdateRemark;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Http\Resources\RemarkResource;
@@ -36,9 +34,6 @@ class UpdateRemarkLogic extends AbstractControllerLogic
     /** @var FetchesRemark */
     private $fetchesRemark;
 
-    /** @var FetchesDistrict */
-    private $fetchesDistrict;
-
     /**
      * UpdateRemarkLogic constructor.
      * @param CanUpdateRemark $canUpdateRemark
@@ -46,12 +41,11 @@ class UpdateRemarkLogic extends AbstractControllerLogic
      * @param FetchesRemark $fetchesRemark
      * @param FetchesDistrict $fetchesDistrict
      */
-    public function __construct(CanUpdateRemark $canUpdateRemark, UpdatesRemark $updatesRemark, FetchesRemark $fetchesRemark, FetchesDistrict $fetchesDistrict)
+    public function __construct(CanUpdateRemark $canUpdateRemark, UpdatesRemark $updatesRemark, FetchesRemark $fetchesRemark)
     {
         $this->canUpdateRemark = $canUpdateRemark;
         $this->updatesRemark = $updatesRemark;
         $this->fetchesRemark = $fetchesRemark;
-        $this->fetchesDistrict = $fetchesDistrict;
     }
 
 
@@ -62,7 +56,7 @@ class UpdateRemarkLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $object = new RemarkObject($request->input('comment'), $request->input('commenter_id'));
+        $object = new RemarkObject($request->input('content'), $request->input('commenter_id'));
 
         $this->canUpdateRemark->passes($object);
 
diff --git a/app/Classes/Modules/Remarks/DataTransferObjects/RemarkObject.php b/app/Classes/Modules/Remarks/DataTransferObjects/RemarkObject.php
index e0c509e6..44a9507f 100644
--- a/app/Classes/Modules/Remarks/DataTransferObjects/RemarkObject.php
+++ b/app/Classes/Modules/Remarks/DataTransferObjects/RemarkObject.php
@@ -11,12 +11,12 @@ class RemarkObject implements DataTransferObject
     private $commenterID;
 
     /** @var string*/
-    private $comment;;
+    private $content;
 
-    public function __construct(int $commenterID, string $comment)
+    public function __construct(string $content, int $commenterID)
     {
         $this->commenterID = $commenterID;
-        $this->comment = $comment;
+        $this->content = $content;
     }
 
     /**
@@ -30,9 +30,9 @@ class RemarkObject implements DataTransferObject
     /**
      * @return string
      */
-    public function getComment(): ?string
+    public function getContent(): ?string
     {
-        return $this->comment;
+        return $this->content;
     }
 
 }
diff --git a/app/Classes/Modules/Remarks/Services/CreatesRemark.php b/app/Classes/Modules/Remarks/Services/CreatesRemark.php
index 9bfe3303..8c221878 100644
--- a/app/Classes/Modules/Remarks/Services/CreatesRemark.php
+++ b/app/Classes/Modules/Remarks/Services/CreatesRemark.php
@@ -21,7 +21,7 @@ class CreatesRemark extends AbstractUpdateRelationshipRecord
         $model = new Remark();
 
         $model->commenter_id = $object->getCommenterId();
-        $model->comment = $object->getComment();
+        $model->content = $object->getContent();
 
         return $this->handler($user->remarks(), $model);
 
diff --git a/app/Classes/Modules/Remarks/Services/UpdatesRemark.php b/app/Classes/Modules/Remarks/Services/UpdatesRemark.php
index 6d0c61eb..4ba9501c 100644
--- a/app/Classes/Modules/Remarks/Services/UpdatesRemark.php
+++ b/app/Classes/Modules/Remarks/Services/UpdatesRemark.php
@@ -18,7 +18,7 @@ class UpdatesRemark extends AbstractUpdateRecord
     public function execute(Remark $model, RemarkObject $object) {
 
         $model->commenter_id = $object->getCommenterId();
-        $model->comment = $object->getComment();
+        $model->content = $object->getContent();
 
         return $this->handler($model);
 
diff --git a/app/Classes/Modules/Remarks/Standards/Validators/RemarkValidation.php b/app/Classes/Modules/Remarks/Standards/Validators/RemarkValidation.php
index afbd8b82..b35d3bde 100644
--- a/app/Classes/Modules/Remarks/Standards/Validators/RemarkValidation.php
+++ b/app/Classes/Modules/Remarks/Standards/Validators/RemarkValidation.php
@@ -17,7 +17,7 @@ class RemarkValidation extends AbstractValidation
     protected function data($object): array {
         return [
             'commenter_id' => $object->getCommenterId(),
-            'comment' => $object->getComment(),
+            'content' => $object->getContent(),
         ];
     }
 
@@ -27,7 +27,7 @@ class RemarkValidation extends AbstractValidation
     protected function rules(): array {
         return [
             'commenter_id' => 'required',
-            'comment' => 'required',
+            'content' => 'required',
         ];
     }
 
diff --git a/app/Http/Controllers/Packages/DeletePackageController.php b/app/Http/Controllers/Packages/DeletePackageController.php
index a2dad9d0..a39a9cc2 100644
--- a/app/Http/Controllers/Packages/DeletePackageController.php
+++ b/app/Http/Controllers/Packages/DeletePackageController.php
@@ -13,7 +13,7 @@ class DeletePackageController
      * @param DeletePackageLogic $logic
      * @return JsonResponse
      */
-    public function destroy(Request $request, DeletePackageLogic $logic): JsonResponse {
+    public function delete(Request $request, DeletePackageLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/PackingLists/DeletePackingListController.php b/app/Http/Controllers/PackingLists/DeletePackingListController.php
index f2b18e5d..7bf70f04 100644
--- a/app/Http/Controllers/PackingLists/DeletePackingListController.php
+++ b/app/Http/Controllers/PackingLists/DeletePackingListController.php
@@ -13,7 +13,7 @@ class DeletePackingListController
      * @param DeletePackingListLogic $logic
      * @return JsonResponse
      */
-    public function destroy(Request $request, DeletePackingListLogic $logic): JsonResponse {
+    public function delete(Request $request, DeletePackingListLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Remarks/DeleteRemarkController.php b/app/Http/Controllers/Remarks/DeleteRemarkController.php
index e6112495..8d0163c0 100644
--- a/app/Http/Controllers/Remarks/DeleteRemarkController.php
+++ b/app/Http/Controllers/Remarks/DeleteRemarkController.php
@@ -13,7 +13,7 @@ class DeleteRemarkController
      * @param DeleteRemarkLogic $logic
      * @return JsonResponse
      */
-    public function destroy(Request $request, DeleteRemarkLogic $logic): JsonResponse {
+    public function delete(Request $request, DeleteRemarkLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Schedules/DeleteScheduleController.php b/app/Http/Controllers/Schedules/DeleteScheduleController.php
index de9d178c..492349fd 100644
--- a/app/Http/Controllers/Schedules/DeleteScheduleController.php
+++ b/app/Http/Controllers/Schedules/DeleteScheduleController.php
@@ -13,7 +13,7 @@ class DeleteRemarkController
      * @param DeleteScheduleLogic $logic
      * @return JsonResponse
      */
-    public function destroy(Request $request, DeleteScheduleLogic $logic): JsonResponse {
+    public function delete(Request $request, DeleteScheduleLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Transports/DeleteTransportController.php b/app/Http/Controllers/Transports/DeleteTransportController.php
index 4b4fe378..c30f17ea 100644
--- a/app/Http/Controllers/Transports/DeleteTransportController.php
+++ b/app/Http/Controllers/Transports/DeleteTransportController.php
@@ -13,7 +13,7 @@ class DeleteRemarkController
      * @param DeleteTransportLogic $logic
      * @return JsonResponse
      */
-    public function destroy(Request $request, DeleteTransportLogic $logic): JsonResponse {
+    public function delete(Request $request, DeleteTransportLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Resources/RemarkResource.php b/app/Http/Resources/RemarkResource.php
index 72721f02..d5f93d79 100644
--- a/app/Http/Resources/RemarkResource.php
+++ b/app/Http/Resources/RemarkResource.php
@@ -17,7 +17,7 @@ class RemarkResource extends JsonResource
         return [
             'id' => $this->id,
             'commenter_id' => $this->commenter_id,
-            'comment' => $this->comment,
+            'content' => $this->content,
         ];
     }
 }
diff --git a/resources/views/swagger/json.blade.php b/resources/views/swagger/json.blade.php
index 4dbc8fd3..1430611c 100644
--- a/resources/views/swagger/json.blade.php
+++ b/resources/views/swagger/json.blade.php
@@ -237,9 +237,9 @@
             "type": "integer"
           },
           {
-            "name": "comment",
+            "name": "content",
             "in": "query",
-            "description": "Comment",
+            "description": "Content",
             "required": true,
             "type": "string"
           }
@@ -1621,9 +1621,9 @@
             "type": "integer"
           },
           {
-            "name": "comment",
+            "name": "content",
             "in": "query",
-            "description": "Comment",
+            "description": "Content",
             "required": true,
             "type": "string"
           }
@@ -1653,7 +1653,7 @@
         }
       }
     },
-    "/remark/update": {
+    "/remark/update/{id}": {
       "put": {
         "tags": [
           "Remark"
@@ -1667,10 +1667,10 @@
         "parameters": [
           {
             "name": "id",
-            "in": "query",
+            "in": "path",
             "description": "Remark id",
             "required": true,
-            "type": "integer"
+            "type": "string"
           },
           {
             "name": "commenter_id",
@@ -1680,9 +1680,9 @@
             "type": "integer"
           },
           {
-            "name": "comment",
+            "name": "content",
             "in": "query",
-            "description": "Comment",
+            "description": "Content",
             "required": true,
             "type": "string"
           }