diff --git a/app/Classes/Modules/Accounts/ControllersLogic/AddNewMemberLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/AddNewMemberLogic.php
new file mode 100644
index 00000000..19dc5b59
--- /dev/null
+++ b/app/Classes/Modules/Accounts/ControllersLogic/AddNewMemberLogic.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Exceptions\ResourceConflictException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
+use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\UserResource;
+use Illuminate\Database\QueryException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class AddNewMemberLogic extends AbstractControllerLogic
+{
+
+    public function notification(): array
+    {
+        return [
+            'title' => 'Updated Email',
+            'message' => 'Successfully updated email'
+        ];
+    }
+
+    /**
+     * @var AssignEmployeeProcessor
+     */
+    private $assignEmployeeProcessor;
+
+    /**
+     * @var GenerateEmailVerificationAttemptProcessor
+     */
+    private $generateEmailVerificationAttemptProcessor;
+
+    /**
+     * AddNewMemberLogic constructor.
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     */
+    public function __construct(AssignEmployeeProcessor $assignEmployeeProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
+    {
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ResourceConflictException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        try {
+            $user = Auth::user()->replicate();
+            $user->email = $request->input('email');
+            $user->status = ApprovalStatus::PENDING_VERIFICATION;
+            $user->save();
+        } catch (QueryException $exception){
+            throw new ResourceConflictException('Unable to change your email address as it already exists');
+        }
+
+        if($company = Auth::user()->companyModule()->first()){
+            $Object = new EmploymentObject($company, $user);
+            $this->assignEmployeeProcessor->execute($Object);
+        }
+
+        $this->generateEmailVerificationAttemptProcessor->execute($user);
+
+        return $this->resourceResponse(new UserResource($user));
+    }
+}
diff --git a/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
index 5d2f6c3b..98844819 100644
--- a/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
@@ -45,7 +45,6 @@ class DeleteSegmentLogic extends AbstractControllerLogic
         $this->fetchesSegment = $fetchesSegment;
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
diff --git a/app/Classes/Modules/Segments/ControllersLogic/FetchConstantLogic.php b/app/Classes/Modules/Segments/ControllersLogic/FetchConstantLogic.php
new file mode 100644
index 00000000..6c5c5b0f
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/FetchConstantLogic.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Http\Resources\ConstantResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchConstantLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Fetch Segment Constant',
+            'message' => 'You have successfully retrieved the Segment Constant'
+        ];
+    }
+
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /**
+     * FetchConstantLogic constructor.
+     * @param FetchesConstant $fetchesConstant
+     */
+    public function __construct(FetchesConstant $fetchesConstant)
+    {
+        $this->fetchesConstant = $fetchesConstant;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $constant = $this->fetchesConstant->execute(['segment_id' => $request->route('id'), 'reference' => $request->route('reference')]);
+
+        return $this->resourceResponse(new ConstantResource($constant));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/FetchSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/FetchSegmentLogic.php
new file mode 100644
index 00000000..d5c35fdc
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/FetchSegmentLogic.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Standards\Rules\CanFetchSegment;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Http\Resources\SegmentResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Segment',
+            'message' => 'You have successfully retrieved a segment'
+        ];
+    }
+
+    /** @var CanFetchSegment */
+    private $canFetchSegment;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /**
+     * FetchSegmentLogic constructor.
+     * @param CanFetchSegment $canFetchSegment
+     * @param FetchesSegment $fetchesSegment
+     */
+    public function __construct(CanFetchSegment $canFetchSegment, FetchesSegment $fetchesSegment)
+    {
+        $this->canFetchSegment = $canFetchSegment;
+        $this->fetchesSegment = $fetchesSegment;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canFetchSegment->passes();
+
+        $query = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        return $this->resourceResponse(new SegmentResource($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/ListSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/ListSegmentLogic.php
new file mode 100644
index 00000000..d8299424
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/ListSegmentLogic.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Services\ListsSegments;
+use App\Http\Resources\SegmentResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Segment',
+            'message' => 'You have successfully retrieved a list of Segment'
+        ];
+    }
+
+
+    /** @var ListsSegments */
+    private $listsSegments;
+
+    /**
+     * ListSegmentLogic constructor.
+     * @param ListsSegments $listsSegments
+     */
+    public function __construct(ListsSegments $listsSegments)
+    {
+        $this->listsSegments = $listsSegments;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $query = $this->listsSegments->execute($this->listsSegments->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(SegmentResource::collection($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php b/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php
new file mode 100644
index 00000000..dac04ec7
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\Segments\Standards\Rules\CanCreateConstant;
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Http\Resources\ConstantResource;
+use App\Models\SegmentConstant;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateConstantLogic  extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Segment Constant',
+            'message' => 'You have successfully updated the Segment Constant'
+        ];
+    }
+
+    /** @var CanUpdateConstant */
+    private $canUpdateConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var CanCreateConstant */
+    private $canCreateConstant;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+
+    /**
+     * UpdateConstantLogic constructor.
+     * @param CanUpdateConstant $canUpdateConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param CanCreateConstant $canCreateConstant
+     * @param CreatesConstant $createsConstant
+     */
+    public function __construct(CanUpdateConstant $canUpdateConstant, UpdatesConstant $updatesConstant, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant, CanCreateConstant $canCreateConstant, CreatesConstant $createsConstant)
+    {
+        $this->canUpdateConstant = $canUpdateConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->canCreateConstant = $canCreateConstant;
+        $this->createsConstant = $createsConstant;
+    }
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $object = new ConstantObject($request->input('name'), $request->input('reference'), $request->input('detail'));
+
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        try {
+
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $object->getReference()]);
+            $this->canUpdateConstant->passes($object);
+
+            /** @var SegmentConstant $constant */
+            $constant = $this->updatesConstant->execute($constant, $object);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $this->canCreateConstant->passes($object);
+
+            /** @var SegmentConstant $constant */
+            $constant = $this->createsConstant->execute($segment, $object);
+
+        }
+
+
+        return $this->resourceResponse(new ConstantResource($constant));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php b/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php
new file mode 100644
index 00000000..43eaa54e
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Http\Resources\SegmentResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+
+use App\Classes\Modules\Segments\Standards\Rules\CanUpdateSegment;
+use App\Classes\Modules\Segments\Services\UpdatesSegment;
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class UpdateSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Segment',
+            'message' => 'You have successfully updated the Segment'
+        ];
+    }
+
+    /** @var CanUpdateSegment */
+    private $canUpdateSegment;
+
+    /** @var UpdatesSegment */
+    private $updatesSegment;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+
+    /**
+     * UpdateSegmentLogic constructor.
+     * @param CanUpdateSegment $canUpdateSegment
+     * @param UpdatesSegment $updatesSegment
+     * @param FetchesSegment $fetchesSegment
+     */
+    public function __construct(
+        CanUpdateSegment $canUpdateSegment, 
+        UpdatesSegment $updatesSegment, 
+        FetchesSegment $fetchesSegment
+    )
+    {
+        $this->canUpdateSegment = $canUpdateSegment;
+        $this->updatesSegment = $updatesSegment;
+        $this->fetchesSegment = $fetchesSegment;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+            DB::beginTransaction();
+
+            $segment_query = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+            $segment_object = new SegmentObject(
+                $request->input('name', $segment_query->name)
+            );
+            $this->canUpdateSegment->passes($segment_object);
+            $segment_query = $this->updatesSegment->execute($segment_query, $segment_object);
+           
+            DB::commit();
+
+            return $this->resourceResponse(new SegmentResource($segment_query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/ConvertsConstantDetailsToResource.php b/app/Classes/Modules/Segments/Services/ConvertsConstantDetailsToResource.php
new file mode 100644
index 00000000..4489da1f
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/ConvertsConstantDetailsToResource.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ConstantResource;
+use App\Http\Resources\CurrencyResource;
+use App\Models\SegmentConstant;
+
+class ConvertsConstantDetailsToResource
+{
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /**
+     * ConvertsConstantDetailsToResource constructor.
+     * @param FetchesCurrency $fetchesCurrency
+     */
+    public function __construct(FetchesCurrency $fetchesCurrency)
+    {
+        $this->fetchesCurrency = $fetchesCurrency;
+    }
+
+
+    public function execute(SegmentConstant $constant){
+
+        if($constant->reference === SegmentConstants::SUPPLIER_CURRENCIES) {
+            return property_exists($constant->detail, 'id') ? new CurrencyResource($this->fetchesCurrency->execute(['id' => $constant->detail->id])) : '';
+        }
+
+        return $constant->detail;
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/CreatesSegment.php b/app/Classes/Modules/Segments/Services/CreatesSegment.php
index 4dff35a7..aea2d87f 100644
--- a/app/Classes/Modules/Segments/Services/CreatesSegment.php
+++ b/app/Classes/Modules/Segments/Services/CreatesSegment.php
@@ -8,7 +8,6 @@ use App\Models\Segment;
 
 class CreatesSegment extends AbstractUpdateRecord
 {
-
     /**
      * @param SegmentObject $object
      * @return \Illuminate\Database\Eloquent\Model
diff --git a/app/Classes/Modules/Segments/Services/FetchesConstant.php b/app/Classes/Modules/Segments/Services/FetchesConstant.php
new file mode 100644
index 00000000..bfa1b2cb
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/FetchesConstant.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\SegmentConstant;
+
+class FetchesConstant extends AbstractFetchRecord
+{
+
+    /** @var SegmentConstant */
+    private $repository;
+
+    /**
+     * FetchesConstant constructor.
+     * @param SegmentConstant $repository
+     */
+    public function __construct(SegmentConstant $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/ListsConstants.php b/app/Classes/Modules/Segments/Services/ListsConstants.php
new file mode 100644
index 00000000..733a6db7
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/ListsConstants.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\SegmentConstant;
+
+class ListsConstants extends AbstractListRecord
+{
+
+    /** @var SegmentConstant */
+    private $repository;
+
+    /**
+     * ListsConstants constructor.
+     * @param SegmentConstant $repository
+     */
+    public function __construct(SegmentConstant $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/ListsSegments.php b/app/Classes/Modules/Segments/Services/ListsSegments.php
new file mode 100644
index 00000000..af44820d
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/ListsSegments.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Segment;
+
+class ListsSegments extends AbstractListRecord
+{
+
+    /** @var Segment */
+    private $repository;
+
+    /**
+     * ListsSegments constructor.
+     * @param Segment $repository
+     */
+    public function __construct(Segment $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/UpdatesConstant.php b/app/Classes/Modules/Segments/Services/UpdatesConstant.php
new file mode 100644
index 00000000..13fb22c1
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/UpdatesConstant.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Models\SegmentConstant;
+
+class UpdatesConstant extends AbstractUpdateRecord
+{
+
+    /**
+     * @param SegmentConstant $model
+     * @param ConstantObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(SegmentConstant $model, ConstantObject $object)
+    {
+        $model->name = $object->getName();
+        $model->reference = $object->getReference();
+        $model->detail = json_encode($object->getDetail());
+
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Services/UpdatesSegment.php b/app/Classes/Modules/Segments/Services/UpdatesSegment.php
new file mode 100644
index 00000000..17f13efb
--- /dev/null
+++ b/app/Classes/Modules/Segments/Services/UpdatesSegment.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+use App\Models\Segment;
+
+class UpdatesSegment extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Segment $model
+     * @param SegmentObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Segment $model, SegmentObject $object) 
+    {
+        $model->name = $object->getName();
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanCreateConstant.php b/app/Classes/Modules/Segments/Standards/Rules/CanCreateConstant.php
new file mode 100644
index 00000000..55f9c61a
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanCreateConstant.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Standards\Validators\ConstantValidation;
+
+class CanCreateConstant extends AbstractRule
+{
+
+    /** @var ConstantValidation */
+    private $constantValidation;
+
+    /**
+     * CanCreateConstant constructor.
+     * @param ConstantValidation $constantValidation
+     */
+    public function __construct(ConstantValidation $constantValidation)
+    {
+        $this->constantValidation = $constantValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->constantValidation->validate($object, 'POST');
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanFetchSegment.php b/app/Classes/Modules/Segments/Standards/Rules/CanFetchSegment.php
new file mode 100644
index 00000000..e6756305
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanFetchSegment.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+
+class CanFetchSegment extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param CompanyObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanListSegments.php b/app/Classes/Modules/Segments/Standards/Rules/CanListSegments.php
new file mode 100644
index 00000000..9d01231d
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanListSegments.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+
+class CanListSegments extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param SegmentObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param SegmentObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanUpdateConstant.php b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateConstant.php
new file mode 100644
index 00000000..650b249c
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateConstant.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Standards\Validators\ConstantValidation;
+
+class CanUpdateConstant extends AbstractRule
+{
+
+    /** @var ConstantValidation */
+    private $ConstantValidation;
+
+    /**
+     * CanUpdateConstant constructor.
+     * @param ConstantValidation $ConstantValidation
+     */
+    public function __construct(ConstantValidation $ConstantValidation)
+    {
+        $this->ConstantValidation = $ConstantValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->ConstantValidation->validate($object, 'PUT');
+    }
+
+    /**
+     * @param ConstantObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php
new file mode 100644
index 00000000..58a8c0ca
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
+use App\Classes\Modules\Segments\Standards\Validators\SegmentValidation;
+
+class CanUpdateSegment extends AbstractRule
+{
+
+    /** @var SegmentValidation */
+    private $segmentValidation;
+
+
+    /**
+     * CanUpdateSegment constructor.
+     * @param SegmentValidation $segmentValidation
+     */
+    public function __construct(SegmentValidation $segmentValidation)
+    {
+        $this->segmentValidation = $segmentValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+
+        if (!\Auth::user()->can('edit segment')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param SegmentObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->segmentValidation->validate($object);
+    }
+
+    /**
+     * @param SegmentObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Validators/ConstantValidation.php b/app/Classes/Modules/Segments/Standards/Validators/ConstantValidation.php
new file mode 100644
index 00000000..d5ac8819
--- /dev/null
+++ b/app/Classes/Modules/Segments/Standards/Validators/ConstantValidation.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Segments\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+
+class ConstantValidation extends AbstractValidation
+{
+    /**
+     * @param ConstantObject $object
+     * @return array
+     */
+    protected function data($object): array {
+
+        $data = [
+            'name' => $object->getName(),
+            'reference' => $object->getReference(),
+            'detail' => $object->getDetail()
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'name' => 'required',
+            'reference' => 'required',
+            'detail' => 'required'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/CreateServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/CreateServiceTypeLogic.php
new file mode 100644
index 00000000..07672f85
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/CreateServiceTypeLogic.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceTypeConstantDetails;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceCurrencyRates;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanCreateServiceType;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ServiceTypeResource;
+use App\Models\ServiceType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateServiceTypeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Service Type',
+            'message' => 'You have successfully created a new Service Type'
+        ];
+    }
+
+    /** @var CanCreateServiceType */
+    private $canCreateServiceType;
+
+    /** @var CreatesServiceType */
+    private $createsServiceType;
+
+    /** @var CreatesServiceTypeConstantDetails */
+    private $createsServiceTypeConstantDetails;
+
+    /** @var UpdatesServiceCurrencyRates */
+    private $updatesServiceCurrencyRates;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+
+    /**
+     * CreateServiceTypeLogic constructor.
+     * @param CanCreateServiceType $canCreateServiceType
+     * @param CreatesServiceType $createsServiceType
+     * @param CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails
+     * @param UpdatesServiceCurrencyRates $updatesServiceCurrencyRates
+     * @param FetchesSegment $fetchesSegment
+     * @param CreatesConstant $createsConstant
+     */
+    public function __construct(CanCreateServiceType $canCreateServiceType, CreatesServiceType $createsServiceType, CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails, UpdatesServiceCurrencyRates $updatesServiceCurrencyRates, FetchesSegment $fetchesSegment, CreatesConstant $createsConstant)
+    {
+        $this->canCreateServiceType = $canCreateServiceType;
+        $this->createsServiceType = $createsServiceType;
+        $this->createsServiceTypeConstantDetails = $createsServiceTypeConstantDetails;
+        $this->updatesServiceCurrencyRates = $updatesServiceCurrencyRates;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->createsConstant = $createsConstant;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $object = new ServiceTypeObject($request->input('name'));
+
+        $this->canCreateServiceType->passes($object);
+
+        /** @var ServiceType $service */
+        $service = $this->createsServiceType->execute($object);
+
+        $object = new ServiceDetailObject($service->id, (int) $request->input('configurations.bank_id'),
+            $request->input('configurations.service_charge'), $request->input('configurations.minimum_charge'), $request->input('configurations.tax'),
+            $request->input('configurations.po_limit'), $request->input('configurations.currencies'), false, $request->input('configurations.billable'));
+
+        $this->updatesServiceCurrencyRates->execute($service, $object->getCurrencies());
+
+        $constantObject = new ConstantObject('Service Type', SegmentConstants::SERVICE_TYPE, $this->createsServiceTypeConstantDetails->execute($object));
+
+        $this->createsConstant->execute($this->fetchesSegment->execute(['type' => SegmentConstants::STANDARD_SEGMENT]), $constantObject);
+
+
+        return $this->resourceResponse(new ServiceTypeResource($service));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/DeleteServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/DeleteServiceTypeLogic.php
new file mode 100644
index 00000000..c45c49d9
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/DeleteServiceTypeLogic.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\DeletesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanDeleteServiceType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteServiceTypeLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Deleted Service Type',
+            'message' => 'You have successfully deleted a Service Type'
+        ];
+    }
+
+
+    /** @var CanDeleteServiceType */
+    private $canDeleteServiceType;
+
+    /** @var DeletesServiceType */
+    private $deletesServiceType;
+
+    /** @var FetchesServiceType */
+        private $fetchesServiceType;
+
+    /**
+     * DeleteServiceTypeLogic constructor.
+     * @param CanDeleteServiceType $canDeleteServiceType
+     * @param DeletesServiceType $deletesServiceType
+     * @param FetchesServiceType $fetchesServiceType
+     */
+    public function __construct(CanDeleteServiceType $canDeleteServiceType, DeletesServiceType $deletesServiceType, FetchesServiceType $fetchesServiceType)
+    {
+        $this->canDeleteServiceType = $canDeleteServiceType;
+        $this->deletesServiceType = $deletesServiceType;
+        $this->fetchesServiceType = $fetchesServiceType;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $this->canDeleteServiceType->passes();
+
+        $query = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        $this->deletesServiceType->execute($query);
+
+        return $this->response([]);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/FetchServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/FetchServiceTypeLogic.php
new file mode 100644
index 00000000..f7835d34
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/FetchServiceTypeLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanFetchServiceType;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Http\Resources\ServiceTypeResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchServiceTypeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Service Type',
+            'message' => 'You have successfully retrieved a Service Type'
+        ];
+    }
+
+    /** @var CanFetchServiceType */
+    private $canFetchServiceType;
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /**
+     * FetchServiceTypeLogic constructor.
+     * @param CanFetchServiceType $canFetchServiceType
+     * @param FetchesServiceType $fetchesServiceType
+     */
+    public function __construct(CanFetchServiceType $canFetchServiceType, FetchesServiceType $fetchesServiceType)
+    {
+        $this->canFetchServiceType = $canFetchServiceType;
+        $this->fetchesServiceType = $fetchesServiceType;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canFetchServiceType->passes();
+
+        $query = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        return $this->resourceResponse(new ServiceTypeResource($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/ListServiceTypesLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/ListServiceTypesLogic.php
new file mode 100644
index 00000000..10b390ae
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/ListServiceTypesLogic.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\ListsServiceTypes;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanListServiceTypes;
+use App\Http\Resources\ServiceTypeResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListServiceTypesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Service Types',
+            'message' => 'You have successfully retrieved a list of Service Types'
+        ];
+    }
+
+    /** @var CanListServiceTypes */
+    private $canListServiceTypes;
+
+    /** @var ListsServiceTypes */
+    private $listsServiceTypes;
+
+    /**
+     * ListServiceTypesControllerLogic constructor.
+     * @param CanListServiceTypes $canListServiceTypes
+     * @param ListsServiceTypes $listsServiceTypes
+     */
+    public function __construct(CanListServiceTypes $canListServiceTypes, ListsServiceTypes $listsServiceTypes)
+    {
+        $this->canListServiceTypes = $canListServiceTypes;
+        $this->listsServiceTypes = $listsServiceTypes;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $this->canListServiceTypes->passes();
+
+        $query = $this->listsServiceTypes->execute($this->listsServiceTypes->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(ServiceTypeResource::collection($query));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateCustomServiceConstantLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateCustomServiceConstantLogic.php
new file mode 100644
index 00000000..e08ef598
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateCustomServiceConstantLogic.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\CreatesConstant;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\FetchesSegment;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceTypeConstantDetails;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\CustomServiceTypeResource;
+use App\Models\Segment;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCustomServiceConstantLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Segment Service',
+            'message' => 'You have successfully update a segments service configuration'
+        ];
+    }
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /** @var CreatesServiceTypeConstantDetails */
+    private $createsServiceTypeConstantDetails;
+
+    /** @var FetchesSegment */
+    private $fetchesSegment;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var CreatesConstant */
+    private $createsConstant;
+
+    /**
+     * UpdateCustomServiceConstantLogic constructor.
+     * @param FetchesServiceType $fetchesServiceType
+     * @param CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails
+     * @param FetchesSegment $fetchesSegment
+     * @param FetchesConstant $fetchesConstant
+     * @param UpdatesConstant $updatesConstant
+     * @param CreatesConstant $createsConstant
+     */
+    public function __construct(FetchesServiceType $fetchesServiceType, CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails, FetchesSegment $fetchesSegment, FetchesConstant $fetchesConstant, UpdatesConstant $updatesConstant, CreatesConstant $createsConstant)
+    {
+        $this->fetchesServiceType = $fetchesServiceType;
+        $this->createsServiceTypeConstantDetails = $createsServiceTypeConstantDetails;
+        $this->fetchesSegment = $fetchesSegment;
+        $this->fetchesConstant = $fetchesConstant;
+        $this->updatesConstant = $updatesConstant;
+        $this->createsConstant = $createsConstant;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $service = $this->fetchesServiceType->execute(['id' => $request->input('id')]);
+
+        $customFields = $request->input('custom_fields');
+
+        $object = new ServiceDetailObject($service->id, $customFields['bank_id'], $customFields['service_charge'],
+            $customFields['minimum_charge'], $customFields['tax'], $customFields['po_limit'], $request->input('configurations.currencies'),
+            $request->input('configurations.active'), true);
+
+        $constantObject = new ConstantObject('Custom Service Type', SegmentConstants::CUSTOM_SERVICE_TYPE, $this->createsServiceTypeConstantDetails->execute($object, true));
+
+        /** @var Segment $segment */
+        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
+
+        try {
+
+            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'custom_service_type' => $object->getId()]);
+
+            $this->updatesConstant->execute($constant, $constantObject);
+
+        } catch (ResourceNotFoundException $exception){
+
+            $constant = $this->createsConstant->execute($segment, $constantObject);
+        }
+
+
+        return $this->resourceResponse(new CustomServiceTypeResource($constant));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeLogic.php
new file mode 100644
index 00000000..51b88051
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeLogic.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\Modules\Segments\Services\UpdatesConstant;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\Modules\ServiceTypes\Services\CreatesServiceTypeConstantDetails;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceCurrencyRates;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Standards\Rules\CanUpdateServiceType;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ServiceTypeResource;
+use App\Models\ServiceType;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateServiceTypeLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Service Type',
+            'message' => 'You have successfully updated the Service Type'
+        ];
+    }
+
+    /** @var CanUpdateServiceType */
+    private $canUpdateServiceType;
+
+    /** @var UpdatesServiceType */
+    private $updatesServiceType;
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /** @var CreatesServiceTypeConstantDetails */
+    private $createsServiceTypeConstantDetails;
+
+    /** @var UpdatesServiceCurrencyRates */
+    private $updatesServiceCurrencyRates;
+
+    /** @var UpdatesConstant */
+    private $updatesConstant;
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+
+    /**
+     * UpdateServiceTypeLogic constructor.
+     * @param CanUpdateServiceType $canUpdateServiceType
+     * @param UpdatesServiceType $updatesServiceType
+     * @param FetchesServiceType $fetchesServiceType
+     * @param CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails
+     * @param UpdatesServiceCurrencyRates $updatesServiceCurrencyRates
+     * @param UpdatesConstant $updatesConstant
+     * @param FetchesConstant $fetchesConstant
+     */
+    public function __construct(CanUpdateServiceType $canUpdateServiceType, UpdatesServiceType $updatesServiceType, FetchesServiceType $fetchesServiceType, CreatesServiceTypeConstantDetails $createsServiceTypeConstantDetails, UpdatesServiceCurrencyRates $updatesServiceCurrencyRates, UpdatesConstant $updatesConstant, FetchesConstant $fetchesConstant)
+    {
+        $this->canUpdateServiceType = $canUpdateServiceType;
+        $this->updatesServiceType = $updatesServiceType;
+        $this->fetchesServiceType = $fetchesServiceType;
+        $this->createsServiceTypeConstantDetails = $createsServiceTypeConstantDetails;
+        $this->updatesServiceCurrencyRates = $updatesServiceCurrencyRates;
+        $this->updatesConstant = $updatesConstant;
+        $this->fetchesConstant = $fetchesConstant;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $object = new ServiceTypeObject($request->input('name'));
+
+        $this->canUpdateServiceType->passes($object);
+
+        $service = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        /** @var ServiceType $service */
+        $service = $this->updatesServiceType->execute($service, $object);
+
+        $object = new ServiceDetailObject($service->id, (int) $request->input('configurations.bank_id'),
+            $request->input('configurations.service_charge'), $request->input('configurations.minimum_charge'), $request->input('configurations.tax'),
+            $request->input('configurations.po_limit'), $request->input('configurations.currencies'), $request->input('configurations.active'), $request->input('configurations.billable'));
+
+        $this->updatesServiceCurrencyRates->execute($service, $object->getCurrencies());
+
+        $constantObject = new ConstantObject('Service Type', SegmentConstants::SERVICE_TYPE, $this->createsServiceTypeConstantDetails->execute($object));
+
+        $this->updatesConstant->execute($this->fetchesConstant->execute(['service_type' => $service->id]), $constantObject);
+
+        return $this->resourceResponse(new ServiceTypeResource($service));
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeStatusLogic.php b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeStatusLogic.php
new file mode 100644
index 00000000..f1d75665
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/ControllersLogic/UpdateServiceTypeStatusLogic.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceType;
+use App\Classes\Modules\ServiceTypes\Services\UpdatesServiceTypeStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateServiceTypeStatusLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Service Type',
+            'message' => 'You have successfully updated a Service Type status'
+        ];
+    }
+
+    /** @var FetchesServiceType */
+    private $fetchesServiceType;
+
+    /** @var UpdatesServiceTypeStatus */
+    private $updatesServiceTypeStatus;
+
+    /**
+     * UpdateServiceTypeStatusLogic constructor.
+     * @param FetchesServiceType $fetchesServiceType
+     * @param UpdatesServiceTypeStatus $updatesServiceTypeStatus
+     */
+    public function __construct(FetchesServiceType $fetchesServiceType, UpdatesServiceTypeStatus $updatesServiceTypeStatus)
+    {
+        $this->fetchesServiceType = $fetchesServiceType;
+        $this->updatesServiceTypeStatus = $updatesServiceTypeStatus;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+
+        $query = $this->fetchesServiceType->execute(['id' => $request->route('id')]);
+
+        $this->updatesServiceTypeStatus->execute($query, $request->route('status') === 'active' ? ApprovalStatus::APPROVED : ApprovalStatus::SUSPENDED);
+
+        return $this->response([]);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/CustomConfigurationsObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/CustomConfigurationsObject.php
new file mode 100644
index 00000000..b14caa8c
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/CustomConfigurationsObject.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceCurrenciesConfigurations;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\SegmentConstant;
+use Illuminate\Support\Collection;
+
+class CustomConfigurationsObject implements DataTransferObject
+{
+
+
+    /** @var SegmentConstant  */
+    private $configurations;
+
+    /** @var SegmentConstant */
+    private $customOptions;
+
+    /**
+     * CustomConfigurationsObject constructor.
+     * @param SegmentConstant $configurations
+     * @param SegmentConstant $customOptions
+     */
+    public function __construct(SegmentConstant $configurations, SegmentConstant $customOptions)
+    {
+        $this->configurations = $configurations;
+        $this->customOptions = $customOptions;
+    }
+
+    /**
+     * @return SegmentConstant
+     */
+    public function getConfigurations(): SegmentConstant
+    {
+        return $this->configurations;
+    }
+
+    /**
+     * @return SegmentConstant
+     */
+    public function getCustomOptions(): SegmentConstant
+    {
+        return $this->customOptions;
+    }
+
+
+    /**
+     * @param string $name
+     * @return mixed
+     */
+    public function getConfigurationValue(string $name) {
+        return property_exists($this->getCustomOptions()->detail, $name) ?
+            $this->getCustomOptions()->detail->$name: $this->configurations->detail->$name;
+    }
+
+
+    /**
+     * @return mixed
+     */
+    public function calculateServiceCharge(){
+        return ($this->getConfigurationValue('service_charge')->value * 0.01) > $this->getConfigurationValue('minimum_charge')->value ?
+            $this->getConfigurationValue('service_charge')->value : $this->getConfigurationValue('minimum_charge')->value;
+    }
+
+    /**
+     * @return float
+     */
+    public function calculateTax(){
+        return $this->getConfigurationValue('tax')->value * 0.01;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceCurrenciesObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceCurrenciesObject.php
new file mode 100644
index 00000000..fa32e5dd
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceCurrenciesObject.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+
+class ServiceCurrenciesObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $id;
+
+    /** @var boolean */
+    private $isActive;
+
+    /** @var array */
+    private $maxLimit;
+
+    /** @var array */
+    private $minLimit;
+
+    /** @var array */
+    private $rates;
+
+    /**
+     * ServiceCurrenciesObject constructor.
+     * @param int $id
+     * @param bool $isActive
+     * @param array $maxLimit
+     * @param array $minLimit
+     * @param array $rates
+     */
+    public function __construct(int $id, bool $isActive, array $maxLimit, array $minLimit, array $rates)
+    {
+        $this->id = $id;
+        $this->isActive = $isActive;
+        $this->maxLimit = $maxLimit;
+        $this->minLimit = $minLimit;
+        $this->rates = $rates;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMaxLimit(): array
+    {
+        return $this->maxLimit;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMinLimit(): array
+    {
+        return $this->minLimit;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getRates(): array
+    {
+        return array_map(function($rate){
+            return new RateObject($rate['selling'], $rate['payment_method']);
+        }, $this->rates);
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceDetailObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceDetailObject.php
new file mode 100644
index 00000000..233d1fb3
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceDetailObject.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ServiceDetailObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $id;
+
+    /** @var int|null */
+    private $bankId;
+
+    /** @var array|null */
+    private $serviceCharge;
+
+    /** @var array|null */
+    private $minimumCharge;
+
+    /** @var array|null */
+    private $tax;
+
+    /** @var array|null */
+    private $poLimit;
+
+    /** @var array|null */
+    private $currencies;
+
+    /** @var boolean */
+    private $isActive;
+
+    /** @var boolean */
+    private $isBillable;
+
+    /**
+     * ServiceDetailObject constructor.
+     * @param int $id
+     * @param int|null $bankId
+     * @param array|null $serviceCharge
+     * @param array|null $minimumCharge
+     * @param array|null $tax
+     * @param array|null $poLimit
+     * @param array|null $currencies
+     * @param bool $isActive
+     * @param bool $isBillable
+     */
+    public function __construct(int $id, ?int $bankId, ?array $serviceCharge, ?array $minimumCharge, ?array $tax, ?array $poLimit, ?array $currencies, bool $isActive, bool $isBillable)
+    {
+        $this->id = $id;
+        $this->bankId = $bankId;
+        $this->serviceCharge = $serviceCharge;
+        $this->minimumCharge = $minimumCharge;
+        $this->tax = $tax;
+        $this->poLimit = $poLimit;
+        $this->currencies = $currencies;
+        $this->isActive = $isActive;
+        $this->isBillable = $isBillable;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getBankId(): ?int
+    {
+        return $this->bankId;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getServiceCharge(): ?array
+    {
+        return $this->serviceCharge;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getMinimumCharge(): ?array
+    {
+        return $this->minimumCharge;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getTax(): ?array
+    {
+        return $this->tax;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getPoLimit(): ?array
+    {
+        return $this->poLimit;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isBillable(): bool
+    {
+        return $this->isBillable;
+    }
+
+
+    /**
+     * @return array|null
+     */
+    public function getCurrencies(): ?array
+    {
+        return array_map(function($currency){
+            return new ServiceCurrenciesObject($currency['id'], $currency['active'], $currency['maximum_limit'], $currency['minimum_limit'], $currency['rates']);
+        }, $this->currencies);
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceTypeObject.php b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceTypeObject.php
new file mode 100644
index 00000000..f65b7262
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/DataTransferObjects/ServiceTypeObject.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class ServiceTypeObject implements DataTransferObject
+{
+
+    /** @var string */
+    private $name;
+
+    /**
+     * ServiceTypeObject constructor.
+     * @param string $name
+     */
+    public function __construct(string $name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/CreatesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceType.php
new file mode 100644
index 00000000..e9c05e94
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceType.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class CreatesServiceType extends AbstractUpdateRecord
+{
+
+    public function execute(ServiceTypeObject $object) {
+        $model = new ServiceType();
+        $model->name = $object->getName();
+
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/CreatesServiceTypeConstantDetails.php b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceTypeConstantDetails.php
new file mode 100644
index 00000000..aacf66f1
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/CreatesServiceTypeConstantDetails.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\General\Helper;
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceCurrenciesObject;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceDetailObject;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use Illuminate\Support\Str;
+
+class CreatesServiceTypeConstantDetails
+{
+
+    /** @var array */
+    private $ConstantDetails;
+
+
+    /**
+     * @param ServiceDetailObject $object
+     * @param bool|null $isCustomSegment
+     * @return array
+     */
+    public function execute(ServiceDetailObject $object, ?bool $isCustomSegment = false) {
+
+        foreach (Helper::getClassMethodsArray(ServiceDetailObject::class) as $methodName){
+
+            if(Helper::getPropertyName($methodName) === 'currencies'){
+
+                $this->mapCurrencies($object->$methodName(), $isCustomSegment);
+
+                continue;
+            }
+
+            $this->addToConstantDetails($methodName, $this->cleanValue($object->$methodName()));
+
+        }
+
+        return $this->ConstantDetails;
+
+    }
+
+    /**
+     * @param array $currencies
+     * @param bool $isCustomSegment
+     */
+    private function mapCurrencies(array $currencies, bool $isCustomSegment){
+
+        $isEmpty = true;
+        foreach ($currencies as $currency){
+
+            if(!$currency->isActive()) { continue; }
+
+            $currencyObject = [];
+
+
+            foreach (Helper::getClassMethodsArray(ServiceCurrenciesObject::class) as $methodName){
+
+                if($methodName === 'isActive') continue;
+                if($methodName === 'getRates') {
+                    $currencyObject['rates'] = $this->mapRates($currency->$methodName(), $isCustomSegment);
+                    continue;
+                }
+
+                $value = $this->cleanValue($currency->$methodName());
+
+                if($this->isAddable($value)) {
+                    $isEmpty = false;
+                    $currencyObject[Helper::getPropertyName($methodName)] = $value;
+                }
+
+            }
+
+            $this->addToCurrencyDetails($currencyObject);
+
+        }
+
+        if($isEmpty) $this->ConstantDetails['currencies'] = [];
+
+    }
+
+    private function mapRates(array $rates, bool $isCustomSegment){
+
+        if(!$isCustomSegment) return [];
+
+        $ratesObject = [];
+
+        /** @var RateObject $rate */
+        foreach ($rates as $rate){
+
+            $selling = $this->cleanValue($rate->getSelling());
+
+            if(!$selling['value']) continue;
+
+            $ratesObject[] = [
+                'payment_type' => $rate->getPaymentMethodType(),
+                'payment_method' => PaymentMethodType::PAYMENT_METHODS_ID[$rate->getPaymentMethodType()],
+                'selling' => $rate->getSelling()
+            ];
+
+        }
+        return $ratesObject;
+
+    }
+
+
+    /**
+     * @param string $methodName
+     * @param $value
+     */
+    private function addToConstantDetails(string $methodName, $value){
+        $this->isAddable($value) ? $this->ConstantDetails[Helper::getPropertyName($methodName)] = $value : null;
+    }
+
+    /**
+     * @param $value
+     * @return bool
+     */
+    private function isAddable($value){
+
+        return $value !== '' && $value !== null;
+    }
+
+    private function cleanValue($value){
+
+        if(is_array($value)) {
+            if(array_key_exists('value', $value)) $value['value'] = floatval(str_replace(',', '', $value['value']));
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param array $value
+     */
+    private function addToCurrencyDetails(array $value){
+        $this->ConstantDetails['currencies'][] = $value;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/DeletesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/DeletesServiceType.php
new file mode 100644
index 00000000..3cc4d69d
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/DeletesServiceType.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class DeletesServiceType extends AbstractDeleteRecord
+{
+
+    public function execute(ServiceType $model) {
+        return $this->handler($model);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceBankConfigurations.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceBankConfigurations.php
new file mode 100644
index 00000000..28843e4d
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceBankConfigurations.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\Modules\Banks\Services\FetchesBank;
+use App\Models\SegmentConstant;
+
+class FetchesServiceBankConfigurations
+{
+
+    /** @var FetchesBank */
+    private $fetchesBank;
+
+    /**
+     * FetchesServiceBankConfigurations constructor.
+     * @param FetchesBank $fetchesBank
+     */
+    public function __construct(FetchesBank $fetchesBank)
+    {
+        $this->fetchesBank = $fetchesBank;
+    }
+
+    public function execute(SegmentConstant $constants)
+    {
+        return $this->fetchesBank->execute(['id' => $constants->detail->bank_id]);
+    }
+}
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceConfigurations.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceConfigurations.php
new file mode 100644
index 00000000..d641d641
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceConfigurations.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Models\SegmentConstant;
+
+class FetchesServiceConfigurations
+{
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /** @var FetchesServiceCurrenciesConfigurations */
+    private $fetchesServiceCurrenciesConfigurations;
+
+    /** @var FetchesServiceBankConfigurations */
+    private $fetchesServiceBankConfigurations;
+
+    /**
+     * FetchesServiceConfigurations constructor.
+     * @param FetchesConstant $fetchesConstant
+     * @param FetchesServiceCurrenciesConfigurations $fetchesServiceCurrenciesConfigurations
+     */
+    public function __construct(FetchesConstant $fetchesConstant, FetchesServiceCurrenciesConfigurations $fetchesServiceCurrenciesConfigurations, FetchesServiceBankConfigurations $fetchesServiceBankConfigurations)
+    {
+        $this->fetchesConstant = $fetchesConstant;
+        $this->fetchesServiceCurrenciesConfigurations = $fetchesServiceCurrenciesConfigurations;
+        $this->fetchesServiceBankConfigurations = $fetchesServiceBankConfigurations;
+    }
+
+
+    public function execute(SegmentConstant $constant, string $type){
+
+        return array_merge([
+            'active' => (int) $constant->detail->is_active ?? false,
+            'billable' => (int) $constant->detail->is_billable ?? false,
+            'bank_id' => property_exists($constant->detail, 'bank_id') ? $constant->detail->bank_id : '',
+            'bank_info' => property_exists($constant->detail, 'bank_id') ? $this->fetchesServiceBankConfigurations->execute($constant) : '',
+            'currencies' => $this->fetchesServiceCurrenciesConfigurations->execute($constant)
+        ], $this->addConfigurations($constant)->toArray());
+
+    }
+
+    private function addConfigurations(SegmentConstant $constant) {
+
+        $configurations = collect(['service_charge', 'minimum_charge', 'tax', 'po_limit']);
+
+        return $configurations->flatMap(function($configuration) use($constant) {
+            if(!property_exists($constant->detail, $configuration)) return [];
+
+            return [$configuration => [
+                'type' => $constant->detail->$configuration->type,
+                'value' =>  $configuration !== 'po_limit' ? $this->covertToDecimal($constant->detail->$configuration->value) : $constant->detail->$configuration->value
+            ]];
+
+        });
+
+    }
+
+    private function covertToDecimal($value){
+        return number_format((float)$value, 2, '.', '');
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceCurrenciesConfigurations.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceCurrenciesConfigurations.php
new file mode 100644
index 00000000..7d00225a
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceCurrenciesConfigurations.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\Modules\Currencies\Services\FetchesCurrency;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\CurrencyResource;
+use App\Models\SegmentConstant;
+use Illuminate\Database\Eloquent\Collection;
+
+class FetchesServiceCurrenciesConfigurations
+{
+
+    /** @var FetchesCurrency */
+    private $fetchesCurrency;
+
+    /**
+     * FetchesServiceCurrenciesConfigurations constructor.
+     * @param FetchesCurrency $fetchesCurrency
+     */
+    public function __construct(FetchesCurrency $fetchesCurrency)
+    {
+        $this->fetchesCurrency = $fetchesCurrency;
+    }
+
+    public function execute(SegmentConstant $constants){
+
+        $currencies = array_map(function($configuration) use($constants){
+
+            $currency = $this->fetchesCurrency->execute(['id' => $configuration->id]);
+
+            if(! $currency->exists()) return [];
+
+            return json_decode(json_encode([
+                'currency_object' => new CurrencyResource($currency),
+                'id' => $configuration->id,
+                'active' => true,
+                'maximum_limit' => [
+                    'type' => $configuration->max_limit->type,
+                    'value' => number_format((float)$configuration->max_limit->value, 2, '.', ',')
+                ],
+                'minimum_limit' => [
+                    'type' => $configuration->min_limit->type,
+                    'value' => number_format((float)$configuration->min_limit->value, 2, '.', ',')
+                ],
+                'rates' => $constants->reference === SegmentConstants::SERVICE_TYPE ? $this->standardRates($currency->rates->where('service_id', $constants->detail->id)) : $configuration->rates
+            ]));
+
+        }, $constants->detail->currencies);
+
+        return array_filter($currencies);
+
+    }
+
+    private function standardRates(Collection $rates){
+        return $rates->map(function($rate){
+            return [
+                'payment_method' => PaymentMethodType::PAYMENT_METHODS_ID[$rate->payment_method_type],
+                'selling' => [
+                    'type' => 'rate',
+                    'value' => $rate->selling
+                ]
+            ];
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/FetchesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceType.php
new file mode 100644
index 00000000..7b5899fa
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/FetchesServiceType.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\ServiceType;
+
+class FetchesServiceType extends AbstractFetchRecord
+{
+
+    /** @var ServiceType */
+    private $repository;
+
+    /**
+     * FetchesServiceType constructor.
+     * @param ServiceType $repository
+     */
+    public function __construct(ServiceType $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/ListsServiceTypes.php b/app/Classes/Modules/ServiceTypes/Services/ListsServiceTypes.php
new file mode 100644
index 00000000..344d6c4d
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/ListsServiceTypes.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\ServiceType;
+
+class ListsServiceTypes extends AbstractListRecord
+{
+
+    /** @var ServiceType */
+    private $repository;
+
+    /**
+     * ListsServiceTypes constructor.
+     * @param ServiceType $repository
+     */
+    public function __construct(ServiceType $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceCurrencyRates.php b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceCurrencyRates.php
new file mode 100644
index 00000000..019d30b4
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceCurrencyRates.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+
+use App\Classes\Modules\Currencies\DataTransferObjects\RateObject;
+use App\Classes\Modules\Currencies\Services\Rates\CreatesRateLog;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceCurrenciesObject;
+use App\Models\CurrencyRate;
+use App\Models\ServiceType;
+
+class UpdatesServiceCurrencyRates
+{
+
+    /** @var CreatesRateLog */
+    private $createsRateLog;
+
+    /**
+     * UpdatesServiceCurrencyRates constructor.
+     * @param CreatesRateLog $createsRateLog
+     */
+    public function __construct(CreatesRateLog $createsRateLog)
+    {
+        $this->createsRateLog = $createsRateLog;
+    }
+
+
+    /**
+     * @param ServiceType $service
+     * @param array $currencies
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(ServiceType $service, array $currencies){
+
+        /** @var ServiceCurrenciesObject $currency */
+        foreach ($currencies as $currency) {
+
+            /** @var RateObject $rate */
+            foreach ($currency->getRates() as $rate){
+                if($rate->getSelling()['value'] > 0){
+                    /** @var CurrencyRate $query */
+                    $query = $service->rates()->updateOrCreate([
+                        'currency_id' => $currency->getId(),
+                        'payment_method_type' => $rate->getPaymentMethodType()
+                    ], ['selling' => $rate->getSelling()['value']]);
+
+                    $this->createsRateLog->execute($query);
+                }
+
+            }
+
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceType.php b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceType.php
new file mode 100644
index 00000000..06bd1e4f
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceType.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class UpdatesServiceType extends AbstractUpdateRecord
+{
+
+    public function execute(ServiceType $model, ServiceTypeObject $object) {
+
+        $model->name = $object->getName();
+
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceTypeStatus.php b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceTypeStatus.php
new file mode 100644
index 00000000..065b218e
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Services/UpdatesServiceTypeStatus.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Models\ServiceType;
+
+class UpdatesServiceTypeStatus extends AbstractUpdateRecord
+{
+
+    public function execute(ServiceType $model, int $status) {
+
+        $model->status = $status;
+
+        return $this->handler($model);
+
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanCreateServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanCreateServiceType.php
new file mode 100644
index 00000000..0fb57c32
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanCreateServiceType.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\Modules\ServiceTypes\Standards\Validators\ServiceTypeValidation;
+
+class CanCreateServiceType extends AbstractRule
+{
+
+    /** @var ServiceTypeValidation */
+    private $serviceTypeValidation;
+
+    /**
+     * CanCreateServiceType constructor.
+     * @param ServiceTypeValidation $serviceTypeValidation
+     */
+    public function __construct(ServiceTypeValidation $serviceTypeValidation)
+    {
+        $this->serviceTypeValidation = $serviceTypeValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->serviceTypeValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanDeleteServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanDeleteServiceType.php
new file mode 100644
index 00000000..1a832257
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanDeleteServiceType.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class CanDeleteServiceType extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanFetchServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanFetchServiceType.php
new file mode 100644
index 00000000..e76497c8
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanFetchServiceType.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class CanFetchServiceType extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanListServiceTypes.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanListServiceTypes.php
new file mode 100644
index 00000000..44dc0e8b
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanListServiceTypes.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class CanListServiceTypes extends AbstractRule
+{
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Rules/CanUpdateServiceType.php b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanUpdateServiceType.php
new file mode 100644
index 00000000..0e066109
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Rules/CanUpdateServiceType.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+use App\Classes\Modules\ServiceTypes\Standards\Validators\ServiceTypeValidation;
+
+class CanUpdateServiceType extends AbstractRule
+{
+
+    /** @var ServiceTypeValidation */
+    private $serviceTypeValidation;
+
+    /**
+     * CanUpdateServiceType constructor.
+     * @param ServiceTypeValidation $serviceTypeValidation
+     */
+    public function __construct(ServiceTypeValidation $serviceTypeValidation)
+    {
+        $this->serviceTypeValidation = $serviceTypeValidation;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        // TODO  Set Authorization rules
+        return true;
+
+    }
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->serviceTypeValidation->validate($object);
+
+    }
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/ServiceTypes/Standards/Validators/ServiceTypeValidation.php b/app/Classes/Modules/ServiceTypes/Standards/Validators/ServiceTypeValidation.php
new file mode 100644
index 00000000..86946a39
--- /dev/null
+++ b/app/Classes/Modules/ServiceTypes/Standards/Validators/ServiceTypeValidation.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Classes\Modules\ServiceTypes\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceTypeObject;
+
+class ServiceTypeValidation extends AbstractValidation
+{
+
+
+    /**
+     * @param ServiceTypeObject $object
+     * @return array
+     */
+    protected function data($object): array {
+        return [
+            'name' => $object->getName()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'name' => 'required'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Announcements/ListAnnouncementsController.php b/app/Http/Controllers/Announcements/ListAnnouncementsController.php
index a69dff50..2dcee4d7 100644
--- a/app/Http/Controllers/Announcements/ListAnnouncementsController.php
+++ b/app/Http/Controllers/Announcements/ListAnnouncementsController.php
@@ -17,4 +17,4 @@ class ListAnnouncementsController
     {
         return $logic->execute($request);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Announcements/UpdateAnnouncementController.php b/app/Http/Controllers/Announcements/UpdateAnnouncementController.php
index 72431980..8d406632 100644
--- a/app/Http/Controllers/Announcements/UpdateAnnouncementController.php
+++ b/app/Http/Controllers/Announcements/UpdateAnnouncementController.php
@@ -18,4 +18,3 @@ class UpdateAnnouncementController
         return $logic->execute($request);
     }
 }
-
diff --git a/app/Http/Controllers/Companies/AddNewMemberController.php b/app/Http/Controllers/Companies/AddNewMemberController.php
new file mode 100644
index 00000000..6307ac37
--- /dev/null
+++ b/app/Http/Controllers/Companies/AddNewMemberController.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Accounts\ControllersLogic\AddNewMemberLogic;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class AddNewMemberController
+{
+    /**
+     * @param Request $request
+     * @param AddNewMemberLogic $execute
+     * @return JsonResponse
+     */
+    public function create(Request $request, AddNewMemberLogic $execute) : JsonResponse
+    {
+        return $execute->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Segments/CreateSegmentController.php b/app/Http/Controllers/Segments/CreateSegmentController.php
index 4e748536..2950bdc3 100644
--- a/app/Http/Controllers/Segments/CreateSegmentController.php
+++ b/app/Http/Controllers/Segments/CreateSegmentController.php
@@ -16,5 +16,4 @@ class CreateSegmentController
     public function create(Request $request, CreateSegmentLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
-
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/FetchConstantController.php b/app/Http/Controllers/Segments/FetchConstantController.php
new file mode 100644
index 00000000..e3658802
--- /dev/null
+++ b/app/Http/Controllers/Segments/FetchConstantController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\FetchConstantLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchConstantController
+{
+    /**
+     * @param Request $request
+     * @param FetchConstantLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchConstantLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/FetchSegmentController.php b/app/Http/Controllers/Segments/FetchSegmentController.php
new file mode 100644
index 00000000..91961689
--- /dev/null
+++ b/app/Http/Controllers/Segments/FetchSegmentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\FetchSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchSegmentController
+{
+    /**
+     * @param Request $request
+     * @param FetchSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/ListSegmentsController.php b/app/Http/Controllers/Segments/ListSegmentsController.php
new file mode 100644
index 00000000..3dc14ebd
--- /dev/null
+++ b/app/Http/Controllers/Segments/ListSegmentsController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\ListSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListSegmentsController
+{
+    /**
+     * @param Request $request
+     * @param ListSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/UpdateConstantController.php b/app/Http/Controllers/Segments/UpdateConstantController.php
new file mode 100644
index 00000000..47def571
--- /dev/null
+++ b/app/Http/Controllers/Segments/UpdateConstantController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\UpdateConstantLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateConstantController
+{
+    /**
+     * @param Request $request
+     * @param UpdateConstantLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateConstantLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/UpdateCustomServiceConstantController.php b/app/Http/Controllers/Segments/UpdateCustomServiceConstantController.php
new file mode 100644
index 00000000..29bb6655
--- /dev/null
+++ b/app/Http/Controllers/Segments/UpdateCustomServiceConstantController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\ServiceTypes\ControllersLogic\UpdateCustomServiceConstantLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCustomServiceConstantController
+{
+    /**
+     * @param Request $request
+     * @param UpdateCustomServiceConstantLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateCustomServiceConstantLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/UpdateSegmentController.php b/app/Http/Controllers/Segments/UpdateSegmentController.php
new file mode 100644
index 00000000..51dfe25e
--- /dev/null
+++ b/app/Http/Controllers/Segments/UpdateSegmentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\UpdateSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateSegmentController
+{
+    /**
+     * @param Request $request
+     * @param UpdateSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Resources/ConstantResource.php b/app/Http/Resources/ConstantResource.php
new file mode 100644
index 00000000..c6bcf344
--- /dev/null
+++ b/app/Http/Resources/ConstantResource.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\Modules\Segments\Services\ConvertsConstantDetailsToResource;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ConstantResource extends JsonResource
+{
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'reference' => $this->reference,
+            'detail' => (App()->make(ConvertsConstantDetailsToResource::class))->execute($this->resource)
+        ];
+    }
+}
diff --git a/app/Http/Resources/CustomServiceTypeResource.php b/app/Http/Resources/CustomServiceTypeResource.php
new file mode 100644
index 00000000..8ec26e47
--- /dev/null
+++ b/app/Http/Resources/CustomServiceTypeResource.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\Modules\ServiceTypes\Services\FetchesServiceConfigurations;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Models\ServiceType;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class CustomServiceTypeResource extends JsonResource
+{
+
+    /**
+     * @param \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->detail->id,
+            'name' => ServiceType::where('id', $this->detail->id)->first()->name,
+            'detail' => $this->detail,
+            'configurations' => (App()->make(FetchesServiceConfigurations::class))->execute($this->resource, SegmentConstants::CUSTOM_SERVICE_TYPE)
+        ];
+    }
+}
diff --git a/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue b/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
new file mode 100644
index 00000000..3554a8f2
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
@@ -0,0 +1,218 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row m-b-15" v-for="(item, index) in serviceCurrencies" v-bind:key="item.id">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-3 b-a pointer p-t-20 p-b-20" :class="[{'b-success': item.active}, {'b-grey': !item.active}]" @click="item.active = !item.active">
+                            <div class="absolute" style="top: -10px; right: -27px;" v-if="item.active">
+                                <div class="icon-thumbnail icon-25 bg-success text-white btn-rounded fs-10">
+                                    <i class="fa fs-10 fa-check"></i>
+                                </div>
+                            </div>
+                            <currency-component :deleteable="false" :section="section" :data="item.currency_object"></currency-component>
+                        </div>
+                        <div class="col">
+                            <div class="row h-100 m-r-0 align-items-end" v-show="item.active">
+                                <div class="col p-t-15 b-t b-r b-success bg-master-lightest">
+                                    <div class="row m-b-10">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                                Purchase Limits
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-r-0">
+                                        <div class="col m-r-10 p-r-5">
+                                            <div class="row">
+                                                <div class="col p-r-0">
+                                                    <validation-wrapper-component class="no-border" :validator="$v.parameters.currencies.$each[index].minimum_limit.value">
+                                                        <label>Minimum Limit</label>
+                                                        <input type="text" class="form-control" v-model.lazy="item.minimum_limit.value" v-money="money" :disabled="!item.active">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                                    <div class="row h-100 align-items-center">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-10 muted">{{item.currency_object.short_code}}</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col p-l-5">
+                                            <div class="row">
+                                                <div class="col p-r-0">
+                                                    <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].maximum_limit.value">
+                                                        <label>Maximum Limit</label>
+                                                        <input type="text" class="form-control" v-model.lazy="item.maximum_limit.value" v-money="money" :disabled="!item.active">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                                    <div class="row h-100 align-items-center">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-10 muted">{{item.currency_object.short_code}}</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-r-0" v-show="item.active">
+                        <div class="col p-b-15 bg-master-lightest b-r b-b b-l b-success">
+                            <div class="row">
+                                <div class="col p-r-25 p-l-25">
+                                    <div class="row m-b-10 m-t-10">
+                                        <div class="col p-l-5">
+                                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                                Exchange Rates
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-4 p-l-5 p-r-5 m-b-10" v-for="(rate, method) in item.rates">
+                                            <validation-wrapper-component :validator="$v.parameters.currencies.$each[index].rates.$each[method].selling.value" :class="[{'hint-text': rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'}]">
+                                                <label class="all-caps">{{rate.payment_method}}</label>
+                                                <input type="text" class="form-control" v-model.lazy="rate.selling.value" v-money="exchangeRate" :disabled="!item.active || rate.payment_method === 'wallet' || rate.payment_method === 'payment gateway'">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import formHandler from "../../../general/mixins/formHandler";
+    import { required, requiredIf, minValue, maxValue, decimal} from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    currencies: []
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                currencies: {
+                    $each: {
+                        maximum_limit: {
+                            value:{
+                                required: requiredIf(function (currency) { return currency.active}),
+                            }
+                        },
+                        minimum_limit: {
+                            value:{
+                                required: requiredIf(function (currency) { return currency.active })
+                            }
+                        },
+                        rates: {
+                            required: true,
+                            $each: {
+                                selling: {
+                                    value:{
+                                        required: requiredIf(function (currency) { return currency.active }),
+                                        minValue: minValue(0)
+                                    }
+
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        computed: {
+            convertibleCurrencies() {
+                let vm = this;
+                return this.$store.getters.getListData('convertibleCurrenciesSection').forEach(function(value){
+                    vm.addInactiveCurrency(value)
+                });
+            },
+            serviceCurrencies: function(){
+                return this.data.currencies;
+            }
+        },
+        watch: {
+            convertibleCurrencies(){
+                this.convertibleCurrencies();
+            },
+            serviceCurrencies(currencies){
+                this.$emit('input', currencies)
+            }
+        },
+        methods: {
+            inArray(element){
+                return this.parameters.currencies.some(currency => currency.id === element.id);
+            },
+            pushIfNotExist(element){
+                if (!this.inArray(element)) {
+                    this.parameters.currencies.push(element);
+                }
+            },
+            addInactiveCurrency(element){
+                this.pushIfNotExist({
+                    currency_object: element,
+                    active: false,
+                    id: element.id,
+                    maximum_limit: {
+                        type: 'fixed_amount',
+                        value: 0
+                    },
+                    minimum_limit: {
+                        type: 'fixed_amount',
+                        value: 0
+                    },
+                    rates: [
+                        {
+                            payment_method: 'cash',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'cheque',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'ba',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'wallet',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        },
+                        {
+                            payment_method: 'payment gateway',
+                            selling: {
+                                type: 'rate',
+                                value: 0
+                            }
+                        }
+                    ]
+                });
+            }
+        },
+        mixins: [formHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/elements/PaymentAttemptComponent.vue b/resources/assets/vue/components/settings/elements/PaymentAttemptComponent.vue
new file mode 100644
index 00000000..6266afbe
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/PaymentAttemptComponent.vue
@@ -0,0 +1,151 @@
+<template>
+    <div class="row no-margin">
+        <div class="col p-t-5 p-b-5 b-grey b-a">
+            <div class="row text-center">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading font-orbitron text-danger-light">{{timer.days}}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-7 muted">Days</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto no-padding">
+                    <div class="font-heading p-b-5">:</div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading font-orbitron text-danger-light">{{timer.hours}}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-7 muted">Hours</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto no-padding">
+                    <div class="font-heading p-b-5">:</div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading font-orbitron text-danger-light">{{timer.minutes}}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-7 muted">Minutes</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-auto b-t b-b b-r b-grey pointer requestModal" data-type="paymentAttempt">
+            <div class="row h-100 align-items-center">
+                <div class="col p-l-10 p-r-10">
+                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                         width="25" height="25"
+                         viewBox="0 0 172 172"
+                         style=" fill:#000000;"><defs><linearGradient x1="64.5" y1="40.25606" x2="64.5" y2="86.92719" gradientUnits="userSpaceOnUse" id="color-1_VhrilWh3UcXU_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.80644" x2="86" y2="157.19456" gradientUnits="userSpaceOnUse" id="color-2_VhrilWh3UcXU_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="10.80644" x2="86" y2="157.19456" gradientUnits="userSpaceOnUse" id="color-3_VhrilWh3UcXU_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M86,75.25v-32.25c-23.74944,0 -43,19.25056 -43,43h32.25c0,-5.93669 4.81331,-10.75 10.75,-10.75z" fill="url(#color-1_VhrilWh3UcXU_gr1)"></path><path d="M86,16.125c-38.53069,0 -69.875,31.34431 -69.875,69.875c0,38.53069 31.34431,69.875 69.875,69.875c38.53069,0 69.875,-31.34431 69.875,-69.875c0,-38.53069 -31.34431,-69.875 -69.875,-69.875zM86,150.5c-35.56369,0 -64.5,-28.93631 -64.5,-64.5c0,-35.56369 28.93631,-64.5 64.5,-64.5c35.56369,0 64.5,28.93631 64.5,64.5c0,35.56369 -28.93631,64.5 -64.5,64.5z" fill="url(#color-2_VhrilWh3UcXU_gr2)"></path><path d="M86,26.875c-32.60206,0 -59.125,26.52294 -59.125,59.125c0,32.60206 26.52294,59.125 59.125,59.125c32.60206,0 59.125,-26.52294 59.125,-59.125c0,-32.60206 -26.52294,-59.125 -59.125,-59.125zM139.61294,88.6875c-0.63694,12.78981 -5.74319,24.39444 -13.81375,33.31156l-5.59269,-5.59269l-3.80013,3.80013l5.59269,5.59269c-8.91712,8.07325 -20.51906,13.17681 -33.31156,13.81375v-7.92544h-5.375v7.92544c-12.78981,-0.63694 -24.39444,-5.74319 -33.31156,-13.81375l5.59269,-5.59269l-3.80013,-3.80013l-5.59269,5.59269c-8.07325,-8.91712 -13.17681,-20.51906 -13.81375,-33.31156h40.44687c1.24969,6.12481 6.67575,10.75 13.16606,10.75c7.40944,0 13.4375,-6.02806 13.4375,-13.4375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-40.44687c12.78981,0.63694 24.39444,5.74319 33.31156,13.81375l-5.59269,5.59269l3.80013,3.80013l5.59269,-5.59269c8.07325,8.91713 13.17681,20.51906 13.81375,33.31156h-7.92544v5.375zM86,77.9375c4.44512,0 8.0625,3.61737 8.0625,8.0625c0,4.44512 -3.61738,8.0625 -8.0625,8.0625c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625c0,-4.44512 3.61737,-8.0625 8.0625,-8.0625zM83.3125,32.38706v40.44687c-5.25675,1.07231 -9.40625,5.22181 -10.47856,10.47856h-40.44687c1.36794,-27.49044 23.435,-49.5575 50.92544,-50.92544z" fill="url(#color-3_VhrilWh3UcXU_gr3)"></path></g></g></svg>
+                </div>
+            </div>
+        </div>
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="paymentAttempt">
+            <payment-attempt-limit-form-component :data="{
+                    segment_id: this.segment_id,
+                    name: 'Payment Attempt Duration Limit',
+                    reference: this.reference,
+                    detail: {
+                        minutes: this.minutes
+                    }
+                }" section="paymentAttemptSection" class="text-center"></payment-attempt-limit-form-component>
+        </modal-component>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            segment_id: {
+                required: true,
+                type: Number,
+                default: 1
+            },
+            data:{
+                type: Number,
+                default: 0
+            }
+        },
+        data(){
+            return {
+                reference: 'PAYMENT_ATTEMPT_DURATION_LIMIT',
+                minutes: 0
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.reference);
+            },
+            timer () {
+                return {
+                    days: ('00'+Math.floor(this.minutes / 1440)).substr(('00'+Math.floor(this.minutes / 1440)).length-2),
+                    hours: ('00'+(Math.floor(this.minutes / 60) % 24)).substr(('00'+(Math.floor(this.minutes / 60) % 24)).length-2),
+                    minutes: ('00'+Math.floor(this.minutes % 60)).substr(('00'+Math.floor(this.minutes % 60)).length-2)
+                };
+            }
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchTime();
+                }
+            },
+            'data': function () {
+                this.minutes = this.data
+            }
+        },
+        created(){
+            if(this.segment_id === 1){
+                this.$store.dispatch('updateListQueue', {'name': this.reference});
+                return;
+            }
+
+            if(this.data){
+                this.minutes = this.data
+            }
+
+        },
+        methods: {
+            fetchTime(){
+                return this.submit(route('api.segment.constant.show', this.segment_id, this.reference), 'get', '', false, false)
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.reference, 'data': response.payload.data});
+                this.minutes = response.payload.data.detail.hasOwnProperty('minutes') ? response.payload.data.detail.minutes:0;
+            }
+        }
+
+    }
+</script>
+<style>
+    .blink {
+        animation: blink-animation 1s steps(5, start) infinite;
+        -webkit-animation: blink-animation 1s steps(5, start) infinite;
+    }
+    @keyframes blink-animation {
+        to {
+            visibility: hidden;
+        }
+    }
+    @-webkit-keyframes blink-animation {
+        to {
+            visibility: hidden;
+        }
+    }
+</style>
diff --git a/resources/assets/vue/components/settings/elements/UserProfileComponent.vue b/resources/assets/vue/components/settings/elements/UserProfileComponent.vue
new file mode 100644
index 00000000..fd42e9b9
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/UserProfileComponent.vue
@@ -0,0 +1,67 @@
+<template>
+    <div class="col">
+        <div class="row align-items-center m-b-30">
+            <div class="col-3 p-l-0">
+                <div class="font-heading fs-11 bold text-info">Full Name</div>
+            </div>
+            <div class="col m-r-50">
+                <div class="font-heading fs-11 muted" v-text="$store.getters.getUserName"></div>
+            </div>
+            <div class="col-auto p-r-0">
+                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15 requestModal" data-type="editFullName">
+                    <i class="fa fa-pencil m-r-10"></i>Edit
+                </div>
+            </div>
+        </div>
+
+        <div class="row align-items-center m-b-30">
+            <div class="col-3 p-l-0">
+                <div class="font-heading fs-11 bold text-info">Password</div>
+            </div>
+            <div class="col m-r-50">
+                <div class="font-heading fs-11 muted">********</div>
+            </div>
+            <div class="col-auto p-r-0">
+                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15 requestModal"  data-type="resetPassword">
+                    <i class="fa fa-lock m-r-10"></i>Request Password Reset
+                </div>
+            </div>
+        </div>
+
+        <div class="row align-items-center">
+            <div class="col-3 p-l-0">
+                <div class="font-heading fs-11 bold text-info">Email Address</div>
+            </div>
+            <div class="col m-r-50">
+                <div class="font-heading fs-11 muted" v-text="$store.getters.getUserEmail"></div>
+            </div>
+            <div class="col-auto p-r-0">
+                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15 requestModal" data-type="editEmail">
+                    <i class="fa fa-envelope-open-o m-r-10"></i>Request Email Change
+                </div>
+            </div>
+        </div>
+
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editFullName">
+            <edit-user-profile-fullname-form-component :data="{name: $store.getters.getUserName}" :section="section"></edit-user-profile-fullname-form-component>
+        </modal-component>
+
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="resetPassword">
+            <reset-user-password-form-component :data="{email: $store.getters.getUserEmail}"  section="resetPassword"></reset-user-password-form-component>
+        </modal-component>
+
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editEmail">
+            <edit-email-form-component :data="{email: $store.getters.getUserEmail}" section="editEmail"></edit-email-form-component>
+        </modal-component>
+    </div>
+</template>
+
+<script>
+export default {
+  props: {
+    section: {
+      default: "editFullNameSection",
+    },
+  },
+};
+</script>
diff --git a/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
new file mode 100644
index 00000000..a29f7572
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
@@ -0,0 +1,128 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">{{this.data?"Update":"Create"}} Announcement</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.title">
+                                <label>Title</label>
+                                <input type="text" class="form-control" v-model="parameters.title">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.description">
+                                <label>Message</label>
+                                <textarea class="form-control h-75" v-model="parameters.description"  rows="20"></textarea>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+
+                    <div class="row m-b-20">
+                        <div class="col-6">
+                            <validation-wrapper-component :validator="$v.parameters.starting_on">
+                                <label>Start Date</label>
+                                <input type="date" v-model="parameters.starting_on">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-6">
+                            <validation-wrapper-component :validator="$v.parameters.ending_on">
+                                <label>End Date</label>
+                                <input type="date" v-model="parameters.ending_on">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>  
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" :data-dismiss="closable ? 'modal' : ''" @click="$emit('close')">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">{{this.data?"Update":"Create"}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf } from "vuelidate/lib/validators";
+    export default {
+        props : {            
+            closable: {
+                type: Boolean,
+                default: true
+            },
+            country_id: {
+                type: Number,
+                default: 1
+            }
+        },
+        data(){
+            return {
+                parameters: {
+                    starting_on:'',
+                    ending_on:'',                    
+                    // segment_id: '',
+                    title: '',
+                    description: '',                    
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                title: {
+                    required
+                },
+                description: {
+                    required
+                },
+                // segment_id: {
+                //     required
+                // }, 
+                starting_on:{
+                    required
+                },
+                ending_on:{
+                    required
+                },                
+            }
+        },
+        computed:{
+
+        },
+        created(){
+            console.log("lado form");
+        },
+        methods: {
+            submitForm(){
+                //this.submit(route('api.announcement.create'), 'post', this.section, true, false);
+                this.submit((this.data ? this.route('api.announcement.update', this.data.id) : this.route('api.announcement.create')), (this.data ? 'put' : 'post'), this.section, true, false)
+            },
+            // successHandler(response){
+            //     this.closeModal();
+            //     //this.formHandler();
+            //     this.resetForm();
+            // },
+            // errorHandler(error){
+            //     this.formHandler(error.message);
+            // }
+        },
+        mixins: [ModalFormHandler],
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/DeleteAnnouncementFormComponent.vue b/resources/assets/vue/components/settings/forms/DeleteAnnouncementFormComponent.vue
new file mode 100644
index 00000000..5c59b264
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/DeleteAnnouncementFormComponent.vue
@@ -0,0 +1,33 @@
+<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 announcement with title <b>{{item.title}}</b> ?</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.announcement.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/settings/forms/EditEmailFormComponent.vue b/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue
new file mode 100644
index 00000000..d44cd44f
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue
@@ -0,0 +1,58 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h5 class="all-caps m-b-5 bold no-margin">Change Email Address</h5>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.email">
+                                <label>New Email Address</label>
+                                <input type="text" class="form-control" v-model="parameters.email">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.company.team.create'), 'post', section, true, false)">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required, email } from "vuelidate/lib/validators";
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+
+    export default {
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    email: this.data.email,
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                email: { required, email  }
+            }
+        },
+        mixins: [ModalFormHandler]
+
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue
new file mode 100644
index 00000000..95e79174
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue
@@ -0,0 +1,51 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h3 class="all-caps m-b-5 bold no-margin">Edit Full Name</h3>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Full Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.account.user.update', $store.getters.getUserId), 'put', section, true, true)">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import updateProfileFormValidation from '../../../general/mixins/accounts/validation/updateProfileFormValidation';
+    export default {
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    name: this.data.name,
+                }
+            }
+        },
+        mixins: [updateProfileFormValidation]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/PaymentAttemptLimitFormComponent.vue b/resources/assets/vue/components/settings/forms/PaymentAttemptLimitFormComponent.vue
new file mode 100644
index 00000000..63be0142
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/PaymentAttemptLimitFormComponent.vue
@@ -0,0 +1,111 @@
+<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" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <h6 class="all-caps m-b-0 bold">Payment Attempt Limit</h6>
+                            <div class="font-heading fs-10 all-caps muted">Set the payment grace duration before the attempts expires</div>
+                        </div>
+                    </div>
+                    <div class="row  justify-content-center m-b-20">
+                        <div class="col-8 bg-master-dark padding-15 b-rad-lg">
+                            <div class="row justify-content-center">
+                                <div class="col-3 p-r-5 p-l-5">
+                                    <div class="form-group no-margin form-group-default bg-master b-rad-lg p-r-0 p-l-0 p-b-10">
+                                        <label class="muted fade fs-8 lh-10 p-b-10">Days</label>
+                                        <input type="text" class="form-control text-center text-success font-orbitron fs-25" v-model.lazy="days" v-mask="'##'">
+                                    </div>
+                                </div>
+                                <div class="col-auto p-r-5 p-l-5">
+                                    <div class="row h-100 align-items-center">
+                                        <div class="col">
+                                            <div class="font-heading fs-25 p-b-10 blink text-white">:</div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-3 p-l-5 p-r-5">
+                                    <div class="form-group no-margin form-group-default bg-master b-rad-lg p-r-0 p-l-0 p-b-10">
+                                        <label class="muted fade fs-8 lh-10 p-b-10">Hours</label>
+                                        <input type="text" class="form-control text-center text-success font-orbitron fs-25" v-model.lazy="hours" v-mask="'##'">
+                                    </div>
+                                </div>
+                                <div class="col-auto p-r-5 p-l-5">
+                                    <div class="row h-100 align-items-center">
+                                        <div class="col">
+                                            <div class="font-heading fs-25 p-b-10 blink text-white">:</div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-3 p-l-5 p-r-5">
+                                    <div class="form-group no-margin form-group-default bg-master b-rad-lg p-r-0 p-l-0 p-b-10">
+                                        <label class="muted fade fs-8 lh-10 p-b-10">Minutes</label>
+                                        <input class="form-control text-center text-success font-orbitron fs-25" v-model.lazy="minutes" v-mask="'##'" />
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.segment.constant.update', data.segment_id), 'put', section, true, true)">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import {TheMask} from 'vue-the-mask'
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        components: {TheMask},
+        data(){
+            return {
+                minutes: '00',
+                hours: '00',
+                days: '00',
+                parameters: {}
+
+            }
+        },
+        watch: {
+            'days' : function (value) {
+                this.days = this.formatTime(value);
+                this.updateMinutes()
+            },
+            'hours' : function (value) {
+                if(value > 23){ value = value - 24; this.days = parseInt(this.days) + 1 }
+                this.hours = this.formatTime(value);
+                this.updateMinutes()
+            },
+            'minutes' : function (value) {
+                if(value > 59){ value = value - 60; this.hours = parseInt(this.hours) + 1 }
+                this.minutes = this.formatTime(value);
+                this.updateMinutes()
+            },
+            'data' : function () {
+                this.days = Math.floor(this.data.detail.minutes / 1440);
+                this.hours = Math.floor(this.data.detail.minutes / 60) % 24;
+                this.minutes = Math.floor(this.data.detail.minutes % 60);
+            }
+        },
+        methods: {
+            updateMinutes(){
+                this.parameters.detail.minutes = parseInt((parseInt(this.days) * 1440) + (parseInt(this.hours) * 60) + parseInt(this.minutes));
+            },
+            formatTime(value){
+                return ('00'+value).substr(('00'+value).length-2)
+            }
+        },
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue
new file mode 100644
index 00000000..1a735522
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue
@@ -0,0 +1,44 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h3 class="all-caps m-b-5 bold no-margin">Reset Password</h3>
+                            <p>A reset password link will send to your email account</p>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.account.authentication.password.forget'), 'post', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import resetPasswordFormValidation from '../../../general/mixins/accounts/validation/resetPasswordFormValidation';
+    export default {
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    email: this.$store.getters.getUserEmail,
+                }
+            }
+        },
+        mixins: [resetPasswordFormValidation]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/SegmentFormComponent.vue b/resources/assets/vue/components/settings/forms/SegmentFormComponent.vue
new file mode 100644
index 00000000..c8f114cf
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/SegmentFormComponent.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Create Custom Segment</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Segment Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.segment.create'), 'post', section, true, false)">Create Segment</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf } from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    name: '',
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: {
+                    required: true
+                }
+            }
+        },
+        mixins: [ModalFormHandler]
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/SegmentServiceFormComponent.vue b/resources/assets/vue/components/settings/forms/SegmentServiceFormComponent.vue
new file mode 100644
index 00000000..5405ae6e
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/SegmentServiceFormComponent.vue
@@ -0,0 +1,293 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Create Service</h6>
+                            <div class="font-heading fs-10 muted">Create a new exchange service</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 m-b-20">
+                        <div class="col-auto pointer bg-master-lightest p-t-15 p-b-15" v-if="data" @click="parameters.configurations.active = !parameters.configurations.active">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail fs-12 icon-25 btn-rounded" :class="[{'bg-success': parameters.configurations.active}, {'bg-white': !parameters.configurations.active}]">
+                                        <i class="fa fa-check fs-12 text-white"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0 p-r-25">
+                                    <div class="font-heading fs-8 all-caps muted">Active For this</div>
+                                    <div class="font-heading fs-8 all-caps">Segment's Customers</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Service Configurations
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-20 m-l-0 m-r-0">
+                        <div class="col p-l-10 p-r-10">
+                            <div class="row">
+                                <div class="col p-l-5 p-r-5">
+                                    <div class="row">
+                                        <div class="col-5 p-r-0">
+                                            <validation-wrapper-component selecatable :validator="$v.custom_field">
+                                                <label>Custom Fields</label>
+                                                <select-component :options="inActiveFields" v-model="custom_field"></select-component>
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-auto p-l-25 p-r-25 bg-success pointer" @click="activateCustomField(custom_field, true)">
+                                            <div class="row align-items-center h-100">
+                                                <div class="col">
+                                                    <i class="fa fa-plus text-white"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col p-l-5">
+                                    <div class="row no-margin">
+                                        <div class="col padding-10 bg-master-lightest">
+                                            <div class="row m-l-0 m-r-0 m-b-10">
+                                                <div class="col-4 p-l-5 p-r-5" v-show="custom_fields.tax.active">
+                                                    <validation-wrapper-component :validator="$v.parameters.configurations.tax" >
+                                                        <label>Tax</label>
+                                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.tax"  v-money="percentage">
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('tax', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+                                            <div class="row m-l-0 m-r-0 m-b-10">
+                                                <div class="col-4 p-l-5 p-r-5" v-show="custom_fields.service_charge.active">
+                                                    <validation-wrapper-component :validator="$v.parameters.configurations.service_charge" >
+                                                        <label>Service Charge</label>
+                                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.service_charge"  v-money="percentage">
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('service_charge', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-5 p-l-5 p-r-5" v-show="custom_fields.minimum_charge.active">
+                                                    <div class="row">
+                                                        <div class="col p-r-0">
+                                                            <validation-wrapper-component :validator="$v.parameters.configurations.minimum_charge" >
+                                                                <label>Minimum Charge</label>
+                                                                <input type="text" class="form-control" v-model.lazy="parameters.configurations.minimum_charge"  v-money="money">
+                                                                <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                                    <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('minimum_charge', false)"></i>
+                                                                </div>
+                                                            </validation-wrapper-component>
+                                                        </div>
+                                                        <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                                            <div class="row h-100 align-items-center">
+                                                                <div class="col">
+                                                                    <div class="font-heading fs-10 muted">MYR</div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row m-l-0 m-r-0 m-b-5">
+                                                <div class="col-5 p-l-5 p-r-5" v-show="custom_fields.po_limit.active">
+                                                    <validation-wrapper-component :validator="$v.parameters.configurations.po_limit" >
+                                                        <label>Abandoned PO Limit **</label>
+                                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.po_limit" v-money="integer">
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('po_limit', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col-7 p-l-5 p-r-5" v-show="custom_fields.bank_id.active">
+                                                    <validation-wrapper-component selecatable :validator="$v.parameters.configurations.bank_id" >
+                                                        <label>Receivable Bank Account</label>
+                                                        <selectable-component :endpoint="route('api.bank.list')+'?filters={%22company_id%22:1}'" section="BankAccountListSection" valueColumn="id" :labelColumn="['bank_name', 'account_no']" v-model="parameters.configurations.bank_id"></selectable-component>
+                                                        <div class="absolute lh-10" style="top: 0; right: 0;">
+                                                            <i class="fa fa-times text-white pointer fs-12 bg-danger padding-5" @click="activateCustomField('bank_id', false)"></i>
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+                                            <div class="row m-l-0 m-r-0 m-b-10" v-show="custom_fields.po_limit.active">
+                                                <div class="col p-l-5 p-r-5">
+                                                    <div class="fs-8 muted">** Abandoned PO's limit is only applicable to transfers that have been paid in full.</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Currencies Settings
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 m-b-10">
+                        <div class="col p-r-0">
+                            <currencies-list-component :data="parameters.configurations" :section="section" v-model="parameters.configurations.currencies"></currencies-list-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">{{this.data ? 'Update' : 'Create'}} Service</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf, minValue, decimal} from "vuelidate/lib/validators";
+    export default {
+        props: {
+            segment_id: {
+                required: true,
+                type: Number
+            }
+        },
+        data(){
+            return {
+                custom_fields: {
+                    bank_id: {
+                        name: 'Receivable Bank Account',
+                        active: false
+                    },
+                    po_limit: {
+                        name: 'Abandoned PO Limit',
+                        active: false
+                    },
+                    tax: {
+                        name: 'Tax',
+                        active: false
+                    },
+                    minimum_charge: {
+                        name: 'Minimum Charge',
+                        active: false
+                    },
+                    service_charge: {
+                        name: 'Service Charge',
+                        active: false
+                    }
+                },
+                custom_field: '',
+                parameters: {
+                    id: null,
+                    configurations: {
+                        active: false,
+                        bank_id: '',
+                        service_charge: {
+                            value: 0
+                        },
+                        minimum_charge: {
+                            value: 0
+                        },
+                        tax: {
+                            value: 0
+                        },
+                        po_limit: {
+                            value: 0
+                        },
+                        currencies: [],
+                    }
+                }
+            }
+        },
+        validations: {
+            custom_field: {},
+            parameters: {
+                configurations: {
+                    bank_id: {},
+                    service_charge: {},
+                    minimum_charge: {},
+                    tax: {},
+                    po_limit: {}
+                }
+            }
+        },
+        watch: {
+            'data': function() {
+                this.updateActiveCustomFields();
+            }
+        },
+        created(){
+            this.updateActiveCustomFields();
+        },
+        computed: {
+            inActiveFields(){
+                return Object.keys(this.custom_fields).map(function(key) {
+                    return {id: key, text: this.custom_fields[key].name}
+                }, this);
+            }
+        },
+        methods: {
+            submitForm(){
+                this.parameters.custom_fields = {
+                    bank_id: this.custom_fields.bank_id.active ? this.parameters.configurations.bank_id : null,
+                    service_charge: this.custom_fields.service_charge.active ? {type: 'percentage', value: this.parameters.configurations.service_charge} : null,
+                    minimum_charge: this.custom_fields.minimum_charge.active ? {type: 'fixed_amount', value: this.parameters.configurations.minimum_charge} : null,
+                    tax: this.custom_fields.tax.active ? {type: 'percentage', value: this.parameters.configurations.tax} : null,
+                    po_limit: this.custom_fields.po_limit.active ? {type: 'fixed_amount', value: this.parameters.configurations.po_limit}: null,
+                };
+
+                this.submit(this.route('api.segment.constant.service.update', this.segment_id, this.parameters.id), 'put', 'segmentSection', true, true)
+            },
+            activateCustomField(fieldName, status){
+                if(fieldName !== ''){
+                    this.custom_fields[fieldName].active = status
+                    if(!status) this.parameters[fieldName] = '';
+                }
+            },
+            updateActiveCustomFields() {
+
+                if(this.data.detail){
+                    Object.keys(this.data.detail).forEach((key) => {
+                        if(this.custom_fields.hasOwnProperty(key)){
+                            this.custom_fields[key].active = true;
+                        }
+                    });
+                }
+
+                if(this.data.configurations){
+                    this.parameters.configurations = {
+                        active: this.data.configurations.hasOwnProperty('active') ? this.data.configurations.active : false,
+                        bank_id: this.data.configurations.hasOwnProperty('bank_id') ? this.data.configurations.bank_id : '',
+                        service_charge: this.data.configurations.hasOwnProperty('service_charge') ? this.data.configurations.service_charge.value : 0,
+                        minimum_charge: this.data.configurations.hasOwnProperty('minimum_charge') ? this.data.configurations.minimum_charge.value : 0,
+                        tax: this.data.configurations.hasOwnProperty('tax') ? this.data.configurations.tax.value : 0,
+                        po_limit: this.data.configurations.hasOwnProperty('po_limit') ? this.data.configurations.po_limit.value : 0,
+                        currencies: this.data.configurations.hasOwnProperty('currencies') ? this.data.configurations.currencies : []
+                    };
+                }
+
+            }
+        },
+        mixins: [ModalFormHandler],
+
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue b/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue
new file mode 100644
index 00000000..002488cc
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/ServiceFormComponent.vue
@@ -0,0 +1,212 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Create Service</h6>
+                            <div class="font-heading fs-10 muted">Create a new exchange service</div>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col-5 p-r-10">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Service Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-auto pointer bg-master-lightest m-r-10" @click="parameters.configurations.billable = !parameters.configurations.billable">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail fs-12 icon-25 btn-rounded" :class="[{'bg-success': parameters.configurations.billable}, {'bg-white': !parameters.configurations.billable}]">
+                                        <i class="fa fa-check fs-12 text-white"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0 p-r-25">
+                                    <div class="font-heading fs-8 all-caps muted">Billable Service</div>
+                                    <div class="font-heading fs-8 all-caps">Include Billing</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-auto pointer bg-master-lightest" v-if="data" @click="parameters.configurations.active = !parameters.configurations.active">
+                            <div class="row h-100 align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail fs-12 icon-25 btn-rounded" :class="[{'bg-success': parameters.configurations.active}, {'bg-white': !parameters.configurations.active}]">
+                                        <i class="fa fa-check fs-12 text-white"></i>
+                                    </div>
+                                </div>
+                                <div class="col p-l-0 p-r-25">
+                                    <div class="font-heading fs-8 all-caps muted">Active For Default</div>
+                                    <div class="font-heading fs-8 all-caps">Customer segment</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Service Configurations
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <div class="row m-b-10">
+                                <div class="col p-r-5">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.service_charge.value">
+                                        <label>Service Charge</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.service_charge.value"  v-money="percentage">
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col p-l-5 p-r-20">
+                                    <div class="row">
+                                        <div class="col p-r-0">
+                                            <validation-wrapper-component :validator="$v.parameters.configurations.minimum_charge.value">
+                                                <label>Minimum Charge</label>
+                                                <input type="text" class="form-control" v-model.lazy="parameters.configurations.minimum_charge.value"  v-money="money">
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col-auto bg-white b-t b-r b-b b-grey">
+                                            <div class="row h-100 align-items-center">
+                                                <div class="col">
+                                                    <div class="font-heading fs-10 muted">MYR</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col p-l-5" v-show="parameters.configurations.billable">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.tax.value">
+                                        <label>Tax</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.tax.value"  v-money="percentage">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col-5 p-r-0" v-show="parameters.configurations.billable">
+                                    <validation-wrapper-component :validator="$v.parameters.configurations.po_limit.value">
+                                        <label>Abandoned PO Limit **</label>
+                                        <input type="text" class="form-control" v-model.lazy="parameters.configurations.po_limit.value" >
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col">
+                                    <validation-wrapper-component selecatable :validator="$v.parameters.configurations.bank_id">
+                                        <label>Receivable Bank Account</label>
+                                        <selectable-component :endpoint="route('api.bank.list')+'?filters={%22company_id%22:1}'" section="BankAccountListSection" valueColumn="id" :labelColumn="['bank_name', 'account_no']" v-model="parameters.configurations.bank_id"></selectable-component>
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-10" v-show="parameters.configurations.billable">
+                                <div class="col">
+                                    <div class="fs-8 muted">** Abandoned PO's limit is only applicable to transfers that have been paid in full.</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10 hint-text muted">
+                                Currencies Settings
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-l-0 m-r-0 m-b-10">
+                        <div class="col p-r-0">
+                            <currencies-list-component :data="parameters.configurations" :section="section" v-model="parameters.configurations.currencies"></currencies-list-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">{{this.data ? 'Update' : 'Create'}} Service</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, requiredIf, minValue, decimal} from "vuelidate/lib/validators";
+    export default {
+        data(){
+            return {
+                parameters: {
+                    name: '',
+                    configurations: {
+                        bank_id: '',
+                        service_charge: {
+                            type: 'percentage',
+                            value: 0
+                        },
+                        minimum_charge: {
+                            type: 'fixed_amount',
+                            value: 0
+                        },
+                        tax: {
+                            type: 'percentage',
+                            value: 0
+                        },
+                        po_limit: {
+                            type: 'fixed_amount',
+                            value: 1
+                        },
+                        billable: true,
+                        currencies: []
+                    },
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: {
+                    required
+                },
+                configurations: {
+                    bank_id: {
+                        required
+                    },
+                    service_charge: {
+                        value:{
+                            required
+                        }
+                    },
+                    minimum_charge: {
+                        value:{
+                            required
+                        }
+                    },
+                    tax: {
+                        value:{
+                            required
+                        }
+                    },
+                    po_limit: {
+                        value:{
+                            required,
+                            minValue: minValue(1)
+                        }
+                    }
+                }
+            }
+        },
+        methods: {
+            submitForm(){
+                this.submit((this.data ? this.route('api.service_type.update', this.data.id) : this.route('api.service_type.create')), (this.data ? 'put' : 'post'), this.section, true, true)
+            }
+        },
+        mixins: [ModalFormHandler],
+
+
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/forms/UpdateServiceStatusFormComponent.vue b/resources/assets/vue/components/settings/forms/UpdateServiceStatusFormComponent.vue
new file mode 100644
index 00000000..aef5b89f
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/UpdateServiceStatusFormComponent.vue
@@ -0,0 +1,33 @@
+<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 {{item.status !== 2 ? 'Activate':'Deactivate'}} <b>{{item.name}}</b> service?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-block b-rad-none" :class="[{'btn-danger': item.status === 2}, {'btn-success': item.status !== 2}]" @click="submit(route('api.service_type.status', item.id, item.status === 2 ? 'inactive' : 'active'), 'put', section, true, true)">{{item.status !== 2 ? 'Activate':'Deactivate'}}</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/user/elements/UserComponent.vue b/resources/assets/vue/components/user/elements/UserComponent.vue
new file mode 100644
index 00000000..20b57e6f
--- /dev/null
+++ b/resources/assets/vue/components/user/elements/UserComponent.vue
@@ -0,0 +1,61 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col-auto p-r-0">
+                    <div class="padding-5 bg-master-lightest">
+                       <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style="fill: rgb(0, 0, 0);"><defs><linearGradient x1="108.17188" y1="101.74069" x2="108.17188" y2="111.89675" gradientUnits="userSpaceOnUse" id="color-1_KpyVqYNRzRZq_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="79.95313" x2="77.9375" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-2_KpyVqYNRzRZq_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="53.75" y1="79.95313" x2="53.75" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-3_KpyVqYNRzRZq_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="65.84375" y1="96.33075" x2="65.84375" y2="107.41131" gradientUnits="userSpaceOnUse" id="color-4_KpyVqYNRzRZq_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="119.59375" y1="88.18494" x2="119.59375" y2="97.09131" gradientUnits="userSpaceOnUse" id="color-5_KpyVqYNRzRZq_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="25.67369" x2="86" y2="144.96375" gradientUnits="userSpaceOnUse" id="color-6_KpyVqYNRzRZq_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M108.17188,111.32163v0c4.08231,0 7.39063,-3.30831 7.39063,-7.39062v-1.806h-14.78125v1.806c0,4.08231 3.30831,7.39063 7.39063,7.39063z" fill="url(#color-1_KpyVqYNRzRZq_gr1)"></path><circle cx="29" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-2_KpyVqYNRzRZq_gr2)"></circle><circle cx="20" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-3_KpyVqYNRzRZq_gr3)"></circle><path d="M65.30625,106.78244h1.075c4.15488,0 7.525,-3.37012 7.525,-7.525v-2.50744h-16.125v2.50744c0,4.15756 3.37013,7.525 7.525,7.525z" fill="url(#color-4_KpyVqYNRzRZq_gr4)"></path><circle cx="44.5" cy="34.5" transform="scale(2.6875,2.6875)" r="1.5" fill="url(#color-5_KpyVqYNRzRZq_gr5)"></circle><path d="M147.8125,114.26444v-18.54106c1.65281,-1.88931 2.6875,-4.33225 2.6875,-7.03588c0,-2.70363 -1.03469,-5.14388 -2.6875,-7.03587v-0.90031c0,-11.36812 -5.55506,-21.45969 -14.10937,-27.87206v-8.53012c0,-2.42144 -1.24969,-4.59294 -3.34594,-5.80769c-2.09625,-1.22013 -4.601,-1.22819 -6.708,-0.02419l-7.009,4.00438c-1.14756,-0.55094 -2.42144,-0.86538 -3.76519,-0.86538c-1.33031,0 -2.59881,0.32519 -3.74906,0.87613l-7.02781,-4.01512c-2.10431,-1.204 -4.60906,-1.19594 -6.708,0.02419c-1.33837,0.77669 -2.28438,1.96994 -2.82725,3.34325c-4.62519,-5.26213 -10.64519,-9.14556 -17.45531,-11.02681c-0.65844,-3.78669 -3.94256,-6.67038 -7.92006,-6.67038h-2.6875c-3.9775,0 -7.26162,2.88369 -7.92275,6.67038c-15.523,4.28656 -27.01475,19.006 -27.01475,36.507v3.22769c-4.67894,1.64475 -8.0625,6.08988 -8.0625,11.47294c0,6.40162 5.0525,11.60194 11.3735,11.9325c0.45419,2.32738 1.1395,4.57144 2.05862,6.69994c-11.80887,9.51644 -18.80712,24.07731 -18.80712,39.41219v7.70237h97.95131h1.48619h40.3125v-7.31269c0,-9.55944 -2.85412,-18.61631 -8.0625,-26.23537zM138.77712,104.43625c0.41388,-1.62056 0.70681,-3.28681 0.84656,-4.99875h0.12631c0.93256,0 1.82212,-0.15587 2.6875,-0.38163v8.7075c-1.15294,-1.16369 -2.37306,-2.27631 -3.66038,-3.32712zM96.75806,100.69794c0.91644,-2.1285 1.60444,-4.37256 2.05594,-6.69725c6.321,-0.33325 11.3735,-5.54163 11.3735,-12.12869c0,-2.11506 -0.59663,-4.07425 -1.56144,-5.80231c1.72806,-1.75763 3.14169,-3.75713 4.24894,-5.91519c4.01781,7.80181 12.13675,13.158 21.5,13.158v13.62025c0,12.84625 -9.72069,23.45112 -22.188,24.88356c-3.14169,-8.18881 -8.39844,-15.46119 -15.42894,-21.11837zM37.625,87.6985v-3.48569v-6.27531c4.44512,0 8.0625,-3.61737 8.0625,-8.0625v-5.375c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h34.9375c1.48081,0 2.6875,1.204 2.6875,2.6875v5.375c0,4.44513 3.61738,8.0625 8.0625,8.0625v9.761c0,15.36444 -12.65812,27.864 -28.21875,27.864c-15.56062,0 -28.21875,-12.49956 -28.21875,-27.864zM104.8125,82.0655c0,3.225 -2.31663,5.91787 -5.375,6.50375v-0.87075v-11.98356v-0.33863c3.05569,0.58856 5.375,3.29487 5.375,6.68919zM145.125,88.6875c0,2.96431 -2.41069,5.375 -5.375,5.375v-10.75c2.96431,0 5.375,2.41069 5.375,5.375zM142.3085,78.27881c-0.82237,-0.20156 -1.67162,-0.34131 -2.5585,-0.34131h-5.375c-10.37375,0 -18.8125,-8.44144 -18.8125,-18.8125h-5.375c0,4.85363 -1.85975,9.44387 -5.15194,12.91881c-0.88688,-0.62081 -1.8705,-1.08844 -2.91056,-1.45125v-3.225c0,-4.79719 -0.89763,-9.374 -2.46981,-13.60144c3.91031,-1.7415 8.17,-2.70363 12.49956,-2.70363c15.84819,0 28.86644,12.00238 30.15375,27.21631zM126.31788,43.18275c0.60738,-0.34669 1.14219,-0.11288 1.34375,0.00537c0.20156,0.11556 0.66919,0.46225 0.66919,1.161v5.19225c-2.49938,-1.25775 -5.16806,-2.22794 -7.96306,-2.87831c0.03763,-0.04569 0.0645,-0.09675 0.10481,-0.13975zM97.42188,48.762v-4.41287c0,-0.69875 0.46762,-1.04544 0.66919,-1.161c0.20156,-0.11556 0.73369,-0.34669 1.34375,-0.00537l5.68137,3.24381c-0.00269,0.00806 -0.00806,0.01344 -0.01075,0.0215c-2.63913,0.52406 -5.19763,1.333 -7.64594,2.42413c-0.0215,-0.03762 -0.04569,-0.07256 -0.0645,-0.11288h0.02687zM65.84375,34.9375c17.04144,0 30.90625,14.54744 30.90625,32.42738v5.19763h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-34.9375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v5.375c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-5.19763c0,-17.87994 13.86481,-32.42737 30.90625,-32.42737zM32.25,88.56925c-3.05837,-0.58856 -5.375,-3.30294 -5.375,-6.69725c0,-3.22231 2.31931,-5.90981 5.375,-6.49569v2.56119v6.27531v3.48569zM37.52825,105.50856c5.96894,9.25844 16.41794,15.42894 28.3155,15.42894c11.87606,0 22.30894,-6.14631 28.28325,-15.37519c1.677,1.41094 3.23306,2.91862 4.6655,4.52844c-7.87169,10.0405 -20.04337,15.98794 -32.94875,15.98794c-12.986,0 -25.09587,-5.934 -32.96756,-16.00675c1.43512,-1.62325 2.98313,-3.15244 4.65206,-4.56337zM110.1875,142.4375h-10.75v-5.375h-5.375v5.375h-56.4375v-5.375h-5.375v5.375h-10.75v-2.32737c0,-9.27725 2.87025,-18.232 7.98725,-25.6925c8.89562,10.73387 22.15844,17.03875 36.3565,17.03875c14.11744,0 27.46088,-6.31563 36.35919,-17.03338c5.13044,7.43094 7.98456,16.297 7.98456,25.68713zM150.5,142.4375h-8.0625v-5.375h-5.375v5.375h-21.5v-2.32737c0,-4.50425 -0.59663,-8.901 -1.70925,-13.115c10.18025,-1.53456 18.70769,-8.10819 22.96469,-17.11131c8.71019,7.81525 13.68206,18.76681 13.68206,30.616z" fill="url(#color-6_KpyVqYNRzRZq_gr6)"></path></g></g></svg>
+                    </div>
+                </div>
+                <div class="col-4">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Name</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.name}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Email</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.email}}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteSupplier">
+                                <i class="fa fa-times"></i>
+                            </button>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteSupplier">
+                                <delete-user-form-component :data="item" section="suppliersSection" class="text-center"></delete-user-form-component>
+                            </modal-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                expanded: false,
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue b/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue
new file mode 100644
index 00000000..cb8af386
--- /dev/null
+++ b/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue
@@ -0,0 +1,33 @@
+<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 admin account?</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.account.user.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/user/form/UserFormComponent.vue b/resources/assets/vue/components/user/form/UserFormComponent.vue
new file mode 100644
index 00000000..5d283733
--- /dev/null
+++ b/resources/assets/vue/components/user/form/UserFormComponent.vue
@@ -0,0 +1,117 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">Add Admin Account</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.email">
+                                <label>Email</label>
+                                <input type="text" class="form-control" v-model="parameters.email">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.password">
+                                <label>Password</label>
+                                <input type="password" class="form-control" v-model="parameters.password">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.password_confirmation">
+                                <label>Password Confirmation</label>
+                                <input type="password" class="form-control" v-model="parameters.password_confirmation">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" :data-dismiss="closable ? 'modal' : ''" @click="$emit('close')">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Add Admin</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import FormHandler from '../../../general/mixins/formHandler';
+    import { required, sameAs, minLength , email} from "vuelidate/lib/validators";
+    export default {
+        props : {
+            closable: {
+                type: Boolean,
+                default: true
+            },
+        },
+        data(){
+            return {
+                parameters: {
+                    name: '',
+                    email: '',
+                    password: '',
+                    password_confirmation: '',
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: {
+                    required
+                },
+                email: {
+                    required,
+                    email
+                },
+                password: {
+                    required,
+                    minLength: minLength(6)
+                },
+                password_confirmation: {
+                    required,
+                    sameAsPassword: sameAs('password')
+                }
+            }
+        },
+        methods: {
+            submitForm(){
+                this.submit(route('api.account.user.admin.create'), 'post', this.section, true, false);
+            },
+            successHandler(response){
+                this.closeModal();
+                this.$emit('createdAdmin', response.payload.data);
+                this.formHandler();
+                this.resetForm();
+            },
+            errorHandler(error){
+                this.formHandler(error.message);
+            }
+        },
+        mixins: [FormHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
new file mode 100644
index 00000000..56da9e67
--- /dev/null
+++ b/resources/views/pages/settings.blade.php
@@ -0,0 +1,325 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+<div class="row">
+    <div class="col">
+        <div class="row tabsContainer">
+            <div class="col-12 col-md-auto">
+                <div class="row">
+                    <div class="col">
+                        <div class="row m-b-5">
+                            <div class="col">
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col bg-master-light active tabButton" tab-name="profile">
+                                                <div class="row align-items-center">
+                                                    <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                width="35" height="35"
+                                                                viewBox="0 0 172 172"
+                                                                style=" fill:#000000;"><defs><linearGradient x1="98.09375" y1="78.38631" x2="98.09375" y2="93.17294" gradientUnits="userSpaceOnUse" id="color-1_43985_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="73.90625" y1="78.38631" x2="73.90625" y2="93.17294" gradientUnits="userSpaceOnUse" id="color-2_43985_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="98.98869" x2="86" y2="111.08513" gradientUnits="userSpaceOnUse" id="color-3_43985_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="12.09375" x2="86" y2="158.68613" gradientUnits="userSpaceOnUse" id="color-4_43985_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M98.09375,79.28125c-3.71066,0 -6.71875,3.00809 -6.71875,6.71875c0,3.71066 3.00809,6.71875 6.71875,6.71875c3.71066,0 6.71875,-3.00809 6.71875,-6.71875c0,-3.71066 -3.00809,-6.71875 -6.71875,-6.71875z" fill="url(#color-1_43985_gr1)"></path><path d="M73.90625,79.28125c-3.71066,0 -6.71875,3.00809 -6.71875,6.71875c0,3.71066 3.00809,6.71875 6.71875,6.71875c3.71066,0 6.71875,-3.00809 6.71875,-6.71875c0,-3.71066 -3.00809,-6.71875 -6.71875,-6.71875z" fill="url(#color-2_43985_gr2)"></path><path d="M75.25,99.4375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75z" fill="url(#color-3_43985_gr3)"></path><path d="M86,16.125c-38.53069,0 -69.875,31.34431 -69.875,69.875c0,38.53069 31.34431,69.875 69.875,69.875c38.53069,0 69.875,-31.34431 69.875,-69.875c0,-38.53069 -31.34431,-69.875 -69.875,-69.875zM86,21.5c35.56369,0 64.5,28.93631 64.5,64.5c0,15.61975 -5.58463,29.96025 -14.85919,41.13219c-5.63569,-7.59756 -12.9,-13.76806 -21.29306,-18.10569c2.61762,-3.63619 4.54456,-7.78569 5.6115,-12.2765h0.97825c7.40944,0 13.4375,-6.02806 13.4375,-13.4375c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375h-0.13706c-1.38137,-18.00894 -16.44481,-32.25 -34.80044,-32.25c-18.35562,0 -33.41906,14.24106 -34.80044,32.25h-0.13706c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375c0,7.40944 6.02806,13.4375 13.4375,13.4375h0.97556c1.06694,4.4935 2.99656,8.64569 5.61688,12.28188c-8.39037,4.33762 -15.66275,10.50544 -21.29844,18.09763c-9.27187,-11.17194 -14.8565,-25.50975 -14.8565,-41.1295c0,-35.56369 28.93631,-64.5 64.5,-64.5zM61.28306,56.39181c0.17737,0.01075 0.34938,0.04569 0.52944,0.04569c5.72169,0 10.36838,-4.50156 10.68819,-10.14531c1.68775,-0.87075 3.46956,-1.58294 5.32663,-2.11775c0.04837,0.50256 0.11019,1.00512 0.11019,1.51306c0,8.89294 -7.23206,16.125 -16.125,16.125c-1.08844,0 -2.15537,-0.12094 -3.20081,-0.33056c0.72831,-1.78987 1.62325,-3.49375 2.67137,-5.09012zM108.26863,53.18025c-1.10188,0.37356 -2.26287,0.56975 -3.45612,0.56975c-5.5255,0 -10.03513,-4.20325 -10.63175,-9.57288c5.53625,1.59906 10.39794,4.77031 14.08788,9.00313zM88.69556,43.13706c0.07256,8.82844 7.27238,15.98794 16.11694,15.98794c2.33812,0 4.58488,-0.5375 6.66231,-1.48619c0.91106,1.548 1.677,3.182 2.29781,4.89394c-2.795,1.28194 -5.83456,1.96725 -8.96012,1.96725c-11.80887,0 -21.41937,-9.57288 -21.49194,-21.36294c0.88419,-0.08063 1.77375,-0.13706 2.67944,-0.13706c0.90838,0 1.806,0.05644 2.69556,0.13706zM56.4375,72.5625c0,-2.02369 0.20694,-3.999 0.59663,-5.90981c1.55337,0.35475 3.14975,0.53481 4.77837,0.53481c8.36888,0 15.61706,-4.816 19.16725,-11.81425c4.48812,8.60269 13.47781,14.50175 23.83275,14.50175c3.58513,0 7.06813,-0.76325 10.32269,-2.12313c0.258,1.5695 0.42731,3.16856 0.42731,4.81063v16.125c0,16.29969 -13.26281,29.5625 -29.5625,29.5625c-16.29969,0 -29.5625,-13.26281 -29.5625,-29.5625zM86,123.625c9.68844,0 18.46312,-3.96944 24.79756,-10.36031c1.91888,0.94063 3.78937,1.95919 5.57925,3.10138c-8.041,8.04369 -18.90925,12.63394 -30.37681,12.63394c-11.46487,0 -22.33313,-4.58756 -30.37681,-12.63394c1.78719,-1.14219 3.65769,-2.16612 5.57656,-3.10675c6.33444,6.39625 15.11181,10.36569 24.80025,10.36569zM120.9375,75.25c4.44512,0 8.0625,3.61737 8.0625,8.0625c0,4.44512 -3.61738,8.0625 -8.0625,8.0625v-2.6875zM51.0625,88.6875v2.6875c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625c0,-4.44512 3.61738,-8.0625 8.0625,-8.0625zM86,150.5c-17.96863,0 -34.23875,-7.39331 -45.9455,-19.28819c3.16319,-4.43438 6.91763,-8.3635 11.16388,-11.69063c9.10256,9.44119 21.58331,14.85381 34.78163,14.85381c13.201,0 25.68175,-5.41263 34.78163,-14.85381c4.24356,3.32712 8.00069,7.25356 11.16388,11.69063c-11.70944,11.89487 -27.97688,19.28819 -45.9455,19.28819z" fill="url(#color-4_43985_gr4)"></path></g></g></svg>
+                                                    </div>
+                                                    <div class="col">
+                                                        <div class="fs-12 m-t-5 all-caps m-b-5">User Profile</div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <template v-if="$store.getters.isSuperAdmin">
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="team">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="108.17188" y1="101.74069" x2="108.17188" y2="111.89675" gradientUnits="userSpaceOnUse" id="color-1_KpyVqYNRzRZq_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="79.95313" x2="77.9375" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-2_KpyVqYNRzRZq_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="53.75" y1="79.95313" x2="53.75" y2="91.83188" gradientUnits="userSpaceOnUse" id="color-3_KpyVqYNRzRZq_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="65.84375" y1="96.33075" x2="65.84375" y2="107.41131" gradientUnits="userSpaceOnUse" id="color-4_KpyVqYNRzRZq_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="119.59375" y1="88.18494" x2="119.59375" y2="97.09131" gradientUnits="userSpaceOnUse" id="color-5_KpyVqYNRzRZq_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="25.67369" x2="86" y2="144.96375" gradientUnits="userSpaceOnUse" id="color-6_KpyVqYNRzRZq_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M108.17188,111.32163v0c4.08231,0 7.39063,-3.30831 7.39063,-7.39062v-1.806h-14.78125v1.806c0,4.08231 3.30831,7.39063 7.39063,7.39063z" fill="url(#color-1_KpyVqYNRzRZq_gr1)"></path><circle cx="29" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-2_KpyVqYNRzRZq_gr2)"></circle><circle cx="20" cy="32" transform="scale(2.6875,2.6875)" r="2" fill="url(#color-3_KpyVqYNRzRZq_gr3)"></circle><path d="M65.30625,106.78244h1.075c4.15488,0 7.525,-3.37012 7.525,-7.525v-2.50744h-16.125v2.50744c0,4.15756 3.37013,7.525 7.525,7.525z" fill="url(#color-4_KpyVqYNRzRZq_gr4)"></path><circle cx="44.5" cy="34.5" transform="scale(2.6875,2.6875)" r="1.5" fill="url(#color-5_KpyVqYNRzRZq_gr5)"></circle><path d="M147.8125,114.26444v-18.54106c1.65281,-1.88931 2.6875,-4.33225 2.6875,-7.03588c0,-2.70363 -1.03469,-5.14388 -2.6875,-7.03587v-0.90031c0,-11.36812 -5.55506,-21.45969 -14.10937,-27.87206v-8.53012c0,-2.42144 -1.24969,-4.59294 -3.34594,-5.80769c-2.09625,-1.22013 -4.601,-1.22819 -6.708,-0.02419l-7.009,4.00438c-1.14756,-0.55094 -2.42144,-0.86538 -3.76519,-0.86538c-1.33031,0 -2.59881,0.32519 -3.74906,0.87613l-7.02781,-4.01512c-2.10431,-1.204 -4.60906,-1.19594 -6.708,0.02419c-1.33837,0.77669 -2.28438,1.96994 -2.82725,3.34325c-4.62519,-5.26213 -10.64519,-9.14556 -17.45531,-11.02681c-0.65844,-3.78669 -3.94256,-6.67038 -7.92006,-6.67038h-2.6875c-3.9775,0 -7.26162,2.88369 -7.92275,6.67038c-15.523,4.28656 -27.01475,19.006 -27.01475,36.507v3.22769c-4.67894,1.64475 -8.0625,6.08988 -8.0625,11.47294c0,6.40162 5.0525,11.60194 11.3735,11.9325c0.45419,2.32738 1.1395,4.57144 2.05862,6.69994c-11.80887,9.51644 -18.80712,24.07731 -18.80712,39.41219v7.70237h97.95131h1.48619h40.3125v-7.31269c0,-9.55944 -2.85412,-18.61631 -8.0625,-26.23537zM138.77712,104.43625c0.41388,-1.62056 0.70681,-3.28681 0.84656,-4.99875h0.12631c0.93256,0 1.82212,-0.15587 2.6875,-0.38163v8.7075c-1.15294,-1.16369 -2.37306,-2.27631 -3.66038,-3.32712zM96.75806,100.69794c0.91644,-2.1285 1.60444,-4.37256 2.05594,-6.69725c6.321,-0.33325 11.3735,-5.54163 11.3735,-12.12869c0,-2.11506 -0.59663,-4.07425 -1.56144,-5.80231c1.72806,-1.75763 3.14169,-3.75713 4.24894,-5.91519c4.01781,7.80181 12.13675,13.158 21.5,13.158v13.62025c0,12.84625 -9.72069,23.45112 -22.188,24.88356c-3.14169,-8.18881 -8.39844,-15.46119 -15.42894,-21.11837zM37.625,87.6985v-3.48569v-6.27531c4.44512,0 8.0625,-3.61737 8.0625,-8.0625v-5.375c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h34.9375c1.48081,0 2.6875,1.204 2.6875,2.6875v5.375c0,4.44513 3.61738,8.0625 8.0625,8.0625v9.761c0,15.36444 -12.65812,27.864 -28.21875,27.864c-15.56062,0 -28.21875,-12.49956 -28.21875,-27.864zM104.8125,82.0655c0,3.225 -2.31663,5.91787 -5.375,6.50375v-0.87075v-11.98356v-0.33863c3.05569,0.58856 5.375,3.29487 5.375,6.68919zM145.125,88.6875c0,2.96431 -2.41069,5.375 -5.375,5.375v-10.75c2.96431,0 5.375,2.41069 5.375,5.375zM142.3085,78.27881c-0.82237,-0.20156 -1.67162,-0.34131 -2.5585,-0.34131h-5.375c-10.37375,0 -18.8125,-8.44144 -18.8125,-18.8125h-5.375c0,4.85363 -1.85975,9.44387 -5.15194,12.91881c-0.88688,-0.62081 -1.8705,-1.08844 -2.91056,-1.45125v-3.225c0,-4.79719 -0.89763,-9.374 -2.46981,-13.60144c3.91031,-1.7415 8.17,-2.70363 12.49956,-2.70363c15.84819,0 28.86644,12.00238 30.15375,27.21631zM126.31788,43.18275c0.60738,-0.34669 1.14219,-0.11288 1.34375,0.00537c0.20156,0.11556 0.66919,0.46225 0.66919,1.161v5.19225c-2.49938,-1.25775 -5.16806,-2.22794 -7.96306,-2.87831c0.03763,-0.04569 0.0645,-0.09675 0.10481,-0.13975zM97.42188,48.762v-4.41287c0,-0.69875 0.46762,-1.04544 0.66919,-1.161c0.20156,-0.11556 0.73369,-0.34669 1.34375,-0.00537l5.68137,3.24381c-0.00269,0.00806 -0.00806,0.01344 -0.01075,0.0215c-2.63913,0.52406 -5.19763,1.333 -7.64594,2.42413c-0.0215,-0.03762 -0.04569,-0.07256 -0.0645,-0.11288h0.02687zM65.84375,34.9375c17.04144,0 30.90625,14.54744 30.90625,32.42738v5.19763h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-34.9375c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v5.375c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-5.19763c0,-17.87994 13.86481,-32.42737 30.90625,-32.42737zM32.25,88.56925c-3.05837,-0.58856 -5.375,-3.30294 -5.375,-6.69725c0,-3.22231 2.31931,-5.90981 5.375,-6.49569v2.56119v6.27531v3.48569zM37.52825,105.50856c5.96894,9.25844 16.41794,15.42894 28.3155,15.42894c11.87606,0 22.30894,-6.14631 28.28325,-15.37519c1.677,1.41094 3.23306,2.91862 4.6655,4.52844c-7.87169,10.0405 -20.04337,15.98794 -32.94875,15.98794c-12.986,0 -25.09587,-5.934 -32.96756,-16.00675c1.43512,-1.62325 2.98313,-3.15244 4.65206,-4.56337zM110.1875,142.4375h-10.75v-5.375h-5.375v5.375h-56.4375v-5.375h-5.375v5.375h-10.75v-2.32737c0,-9.27725 2.87025,-18.232 7.98725,-25.6925c8.89562,10.73387 22.15844,17.03875 36.3565,17.03875c14.11744,0 27.46088,-6.31563 36.35919,-17.03338c5.13044,7.43094 7.98456,16.297 7.98456,25.68713zM150.5,142.4375h-8.0625v-5.375h-5.375v5.375h-21.5v-2.32737c0,-4.50425 -0.59663,-8.901 -1.70925,-13.115c10.18025,-1.53456 18.70769,-8.10819 22.96469,-17.11131c8.71019,7.81525 13.68206,18.76681 13.68206,30.616z" fill="url(#color-6_KpyVqYNRzRZq_gr6)"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">Team</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="standardSegment">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="29.5625" y1="81.51994" x2="29.5625" y2="137.9655" gradientUnits="userSpaceOnUse" id="color-1_SZIOLhqepltk_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-2_SZIOLhqepltk_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="22.70131" x2="86" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-3_SZIOLhqepltk_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="112.875" y1="22.70131" x2="112.875" y2="156.84519" gradientUnits="userSpaceOnUse" id="color-4_SZIOLhqepltk_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.00606" y1="15.45313" x2="51.00606" y2="61.15944" gradientUnits="userSpaceOnUse" id="color-5_SZIOLhqepltk_gr5"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><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><rect x="8" y="31" transform="scale(2.6875,2.6875)" width="6" height="19" fill="url(#color-1_SZIOLhqepltk_gr1)"></rect><path d="M112.875,75.25c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-8.89294 -7.23206,-16.125 -16.125,-16.125c-8.89294,0 -16.125,7.23206 -16.125,16.125c0,8.89294 7.23206,16.125 16.125,16.125zM112.875,48.375c5.92863,0 10.75,4.82138 10.75,10.75c0,5.92862 -4.82137,10.75 -10.75,10.75c-5.92863,0 -10.75,-4.82138 -10.75,-10.75c0,-5.92862 4.82137,-10.75 10.75,-10.75z" fill="url(#color-2_SZIOLhqepltk_gr2)"></path><path d="M151.64756,104.31531c-2.51819,-1.86244 -5.88025,-2.40531 -9.23156,-1.47812l-41.08919,11.36006c0.50525,-1.247 0.79819,-2.60419 0.79819,-4.03394c0,-5.91519 -4.82137,-10.72581 -10.75,-10.72581h-25.20069c-1.78988,-2.6875 -6.34788,-10.75 -12.42431,-10.75h-10.75v-2.6875c0,-4.44513 -3.61738,-8.0625 -8.0625,-8.0625h-10.75c-4.44513,0 -8.0625,3.61737 -8.0625,8.0625v45.6875c0,4.44512 3.61737,8.0625 8.0625,8.0625h10.75c4.44512,0 8.0625,-3.61469 8.0625,-8.0625v-2.021l32.62356,22.04288c4.09575,2.7735 8.86338,4.16563 13.63906,4.16563c4.41287,0 8.83381,-1.18787 12.74412,-3.57706l48.83994,-29.83394c3.10138,-1.88931 5.02831,-5.32394 5.02831,-8.95744v-0.84119c0,-3.30831 -1.53994,-6.35056 -4.22744,-8.35006zM37.625,131.6875c0,1.4835 -1.20669,2.6875 -2.6875,2.6875h-2.6875v-10.75h-5.375v10.75h-2.6875c-1.48081,0 -2.6875,-1.204 -2.6875,-2.6875v-45.6875c0,-1.4835 1.20669,-2.6875 2.6875,-2.6875h10.75c1.48081,0 2.6875,1.20669 2.6875,2.6875zM150.5,113.50656c0,1.77375 -0.94063,3.44806 -2.45369,4.37256l-48.83994,29.83125c-6.35594,3.87806 -14.42919,3.70338 -20.57013,-0.45419l-35.63625,-24.07463v-29.11906h10.75c2.84606,0 6.63544,5.46637 8.299,9.16169l0.71487,1.58831h28.61113c2.96431,0 5.375,2.39994 5.375,5.34813c0,2.97775 -2.41069,5.40187 -5.375,5.40187h-26.875v5.375h26.875h5.375l47.09575,-12.91881c1.72269,-0.47837 3.44,-0.24994 4.59562,0.61544c1.30881,0.97019 2.05863,2.44025 2.05863,4.03125z" fill="url(#color-3_SZIOLhqepltk_gr3)"></path><path d="M86,69.875h0.9245l-0.65306,0.65306c-2.03175,2.02906 -3.14975,4.72731 -3.14975,7.60025c0,2.87025 1.118,5.5685 3.14975,7.60025c2.03175,2.03175 4.73,3.14975 7.60025,3.14975c2.87294,0 5.57119,-1.118 7.60025,-3.14975l0.65306,-0.65306v0.9245c0,5.92863 4.82137,10.75 10.75,10.75c5.92863,0 10.75,-4.82137 10.75,-10.75v-0.9245l0.65306,0.65306c2.02906,2.03175 4.72731,3.14975 7.60025,3.14975c2.87025,0 5.5685,-1.118 7.60025,-3.14975c2.03175,-2.03175 3.14975,-4.73 3.14975,-7.60025c0,-2.87294 -1.118,-5.57119 -3.14975,-7.60025l-0.65306,-0.65306h0.9245c5.92863,0 10.75,-4.82138 10.75,-10.75c0,-5.92862 -4.82137,-10.75 -10.75,-10.75h-0.9245l0.65306,-0.65306c2.03175,-2.02906 3.14975,-4.72731 3.14975,-7.60025c0,-2.87025 -1.118,-5.5685 -3.14975,-7.60025c-4.06619,-4.06619 -11.14506,-4.06081 -15.2005,0l-0.65306,0.65306v-0.9245c0,-5.92862 -4.82137,-10.75 -10.75,-10.75c-5.92863,0 -10.75,4.82138 -10.75,10.75v0.9245l-0.65306,-0.65306c-4.05544,-4.06081 -11.13969,-4.06619 -15.2005,0c-2.03175,2.03175 -3.14975,4.73 -3.14975,7.60025c0,2.87294 1.118,5.57119 3.14975,7.60025l0.65306,0.65306h-0.9245c-5.92862,0 -10.75,4.82138 -10.75,10.75c0,5.92862 4.82138,10.75 10.75,10.75zM97.67181,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013l0.40581,-0.40581c1.99412,3.02613 4.57412,5.60613 7.60025,7.60025zM135.67844,81.92844c-2.03175,2.03175 -5.5685,2.03175 -7.60025,0l-0.40581,-0.40581c3.02612,-1.99413 5.60612,-4.57413 7.60025,-7.60025l0.40581,0.40581c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80012zM128.07819,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0c1.01587,1.01588 1.57487,2.365 1.57487,3.80013c0,1.43512 -0.559,2.78425 -1.57487,3.80013l-0.40581,0.40581c-1.99412,-3.02612 -4.57412,-5.60612 -7.60025,-7.60025zM90.07156,36.32156c2.03175,-2.03175 5.5685,-2.03175 7.60025,0l0.40581,0.40581c-3.02612,1.99413 -5.60612,4.57413 -7.60025,7.60025l-0.40581,-0.40581c-1.01587,-1.01588 -1.57487,-2.365 -1.57487,-3.80013c0,-1.43512 0.559,-2.78425 1.57487,-3.80013zM86,53.75h5.99312l0.63156,-1.79256c2.17419,-6.13825 6.94181,-10.90856 13.08006,-13.08006l1.79525,-0.63425v-5.99312c0,-2.96431 2.41069,-5.375 5.375,-5.375c2.96431,0 5.375,2.41069 5.375,5.375v5.99312l1.79256,0.63156c6.13825,2.17419 10.90856,6.94181 13.08006,13.08006l0.63425,1.79525h5.99312c2.96431,0 5.375,2.41069 5.375,5.375c0,2.96431 -2.41069,5.375 -5.375,5.375h-5.99312l-0.63156,1.79256c-2.17419,6.13825 -6.94181,10.90856 -13.08006,13.08006l-1.79525,0.63425v5.99313c0,2.96431 -2.41069,5.375 -5.375,5.375c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-5.99313l-1.79256,-0.63156c-6.13825,-2.17419 -10.90856,-6.94181 -13.08006,-13.08006l-0.63425,-1.79525h-5.99312c-2.96431,0 -5.375,-2.41069 -5.375,-5.375c0,-2.96431 2.41069,-5.375 5.375,-5.375z" fill="url(#color-4_SZIOLhqepltk_gr4)"></path><path d="M68.47481,32.25h-0.56437c-1.45125,0 -2.17687,-1.74687 -1.15563,-2.76812l0.40312,-0.40313c1.58563,-1.58562 1.58563,-4.13875 0,-5.6975l-1.90812,-1.90812c-1.55875,-1.58563 -4.11188,-1.58563 -5.6975,0l-0.40312,0.40312c-1.02125,1.02125 -2.76812,0.29563 -2.76812,-1.15562v-0.56437c0,-2.23062 -1.80063,-4.03125 -4.03125,-4.03125h-2.6875c-2.23062,0 -4.03125,1.80063 -4.03125,4.03125v0.56437c0,1.45125 -1.74688,2.17687 -2.76813,1.15563l-0.40312,-0.40313c-1.58563,-1.58563 -4.13875,-1.58563 -5.6975,0l-1.90813,1.90812c-1.58562,1.55875 -1.58562,4.11187 0,5.6975l0.40313,0.40313c1.02125,1.02125 0.29563,2.76812 -1.15563,2.76812h-0.56437c-2.23062,0 -4.03125,1.80062 -4.03125,4.03125v2.6875c0,2.23063 1.80063,4.03125 4.03125,4.03125h0.56437c1.45125,0 2.17688,1.74687 1.15563,2.76813l-0.40313,0.40312c-1.58562,1.58563 -1.58562,4.13875 0,5.6975l1.90813,1.90813c1.55875,1.58563 4.11187,1.58563 5.6975,0l0.40312,-0.40312c1.02125,-1.02125 2.76813,-0.29563 2.76813,1.15563v0.56437c0,2.23062 1.80063,4.03125 4.03125,4.03125h2.6875c2.23062,0 4.03125,-1.80063 4.03125,-4.03125v-0.56437c0,-1.45125 1.74687,-2.17687 2.76812,-1.15563l0.40312,0.40312c1.58563,1.58563 4.13875,1.58563 5.6975,0l1.90812,-1.90813c1.58563,-1.55875 1.58563,-4.11187 0,-5.6975l-0.40312,-0.40312c-1.02125,-1.02125 -0.29563,-2.76813 1.15563,-2.76813h0.56437c2.23062,0 4.03125,-1.80062 4.03125,-4.03125v-2.6875c0,-2.23063 -1.80062,-4.03125 -4.03125,-4.03125zM51.00606,45.6875c-4.46125,0 -8.0625,-3.60125 -8.0625,-8.0625c0,-4.46125 3.60125,-8.0625 8.0625,-8.0625c4.46125,0 8.0625,3.60125 8.0625,8.0625c0,4.46125 -3.60125,8.0625 -8.0625,8.0625z" fill="url(#color-5_SZIOLhqepltk_gr5)"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">Service Setup</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-5">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="customSegment">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                    width="35" height="35"
+                                                                    viewBox="0 0 172 172"
+                                                                    style=" fill:#000000;"><defs><linearGradient x1="86" y1="97.08594" x2="86" y2="105.31775" gradientUnits="userSpaceOnUse" id="color-1_43991_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="94.0625" y1="85.83338" x2="94.0625" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-2_43991_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="85.83338" x2="77.9375" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-3_43991_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="28.55469" x2="86" y2="143.10938" gradientUnits="userSpaceOnUse" id="color-4_43991_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M77.9375,96.75c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625z" fill="url(#color-1_43991_gr1)"></path><path d="M94.0625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-2_43991_gr2)"></path><path d="M77.9375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-3_43991_gr3)"></path><path d="M147.8125,51.0625h-18.8125v-8.0625c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-11.2445c-1.11263,-3.12019 -4.06888,-5.375 -7.568,-5.375h-32.25c-3.49912,0 -6.45538,2.25481 -7.568,5.375h-11.2445c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v8.0625h-18.8125c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v59.125c0,4.44512 3.61737,8.0625 8.0625,8.0625h18.8125v8.0625c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-8.0625h18.8125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-59.125c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM147.8125,56.4375c1.4835,0 2.6875,1.20669 2.6875,2.6875v51.0625h-2.88637c-0.80625,-6.09525 -4.28119,-11.78469 -9.47612,-15.25425c0.99437,-1.87319 1.6125,-3.98019 1.6125,-6.24575v-5.375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-13.70894zM134.375,88.6875c0,3.49912 -2.25213,6.45538 -5.375,7.568v-20.50831c3.12287,1.11262 5.375,4.06887 5.375,7.568zM134.6545,99.1365c3.913,2.48056 6.62469,6.84506 7.47125,11.051h-13.12575v-8.33394c2.12044,-0.43269 4.02319,-1.41094 5.6545,-2.71706zM67.1875,37.625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875h32.25c1.4835,0 2.6875,1.20669 2.6875,2.6875v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875h-32.25c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875zM51.0625,40.3125h10.75c0,4.44512 3.61737,8.0625 8.0625,8.0625h32.25c4.44512,0 8.0625,-3.61738 8.0625,-8.0625h10.75c1.4835,0 2.6875,1.20669 2.6875,2.6875v83.3125h-3.34056c-1.73881,-9.23963 -7.19444,-17.45531 -15.06344,-22.66906c1.44319,-2.88906 2.279,-6.13556 2.279,-9.58094v-10.75c0,-11.85456 -9.64544,-21.5 -21.5,-21.5c-11.85456,0 -21.5,9.64544 -21.5,21.5v10.75c0,3.44537 0.83581,6.69188 2.28169,9.58094c-7.869,5.21375 -13.32463,13.42675 -15.06344,22.66906h-3.34325v-83.3125c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM102.125,94.0625c0,8.89294 -7.23206,16.125 -16.125,16.125c-8.89294,0 -16.125,-7.23206 -16.125,-16.125v-10.75c0,-8.89294 7.23206,-16.125 16.125,-16.125c8.89294,0 16.125,7.23206 16.125,16.125zM86,115.5625c6.48494,0 12.29531,-2.89981 16.24056,-7.45513c6.39088,4.22744 10.93006,10.77956 12.59363,18.20513h-57.66837c1.66356,-7.42556 6.20275,-13.97769 12.59631,-18.20244c3.94256,4.55531 9.75294,7.45244 16.23787,7.45244zM43,96.2555c-3.12288,-1.11263 -5.375,-4.06888 -5.375,-7.568v-5.375c0,-3.49912 2.25212,-6.45538 5.375,-7.568zM37.32669,99.12306c1.634,1.31419 3.54481,2.29512 5.67331,2.7305v8.33394h-13.18487c0.78475,-4.57412 3.526,-8.63225 7.51156,-11.06444zM24.1875,56.4375h18.8125v13.70894c-6.12481,1.24969 -10.75,6.67575 -10.75,13.16606v5.375c0,2.26287 0.61544,4.36719 1.60981,6.24038c-5.21106,3.44806 -8.686,9.05688 -9.47613,15.25963h-2.88369v-51.0625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM24.1875,120.9375c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h21.5v5.375zM120.9375,137.0625h-69.875c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h75.25v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875zM147.8125,120.9375h-18.8125v-5.375h21.5v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-4_43991_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">Custom Segments</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col bg-master-light tabButton" tab-name="announcement">
+                                                    <div class="row align-items-center">
+                                                        <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                            width="35" height="35"
+                                                            viewBox="0 0 172 172"
+                                                            style=" fill:#000000;"><defs><linearGradient x1="99.4375" y1="43.33594" x2="99.4375" y2="60.14625" gradientUnits="userSpaceOnUse" id="color-1_43971_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="106.15625" y1="26.875" x2="106.15625" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-2_43971_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="83.3125" y1="26.875" x2="83.3125" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-3_43971_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="73.90625" y1="26.875" x2="73.90625" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-4_43971_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.0625" y1="26.875" x2="51.0625" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-5_43971_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="51.0625" y1="26.875" x2="51.0625" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-6_43971_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="26.875" x2="45.6875" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-7_43971_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="43" y1="26.875" x2="43" y2="146.16775" gradientUnits="userSpaceOnUse" id="color-8_43971_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M112.875,59.125h-26.875c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-10.75c0,-1.4835 1.204,-2.6875 2.6875,-2.6875h26.875c1.4835,0 2.6875,1.204 2.6875,2.6875v10.75c0,1.4835 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-1_43971_gr1)"></path><path d="M155.875,96.75c0,-7.97381 -5.82381,-14.59581 -13.4375,-15.88313v-18.82325c0,-2.08819 -1.16906,-3.94525 -3.05031,-4.85094c-1.88125,-0.90031 -4.06081,-0.65575 -5.69481,0.64769l-21.48925,17.18925c-0.08062,0.0645 -0.13975,0.14781 -0.21769,0.21769h-31.36044c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375h-5.375c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375c0,2.96431 2.41069,5.375 5.375,5.375h5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375v16.125c0,5.92863 4.82138,10.75 10.75,10.75c5.92863,0 10.75,-4.82137 10.75,-10.75v-16.125h9.86044c0.07794,0.06988 0.13706,0.15319 0.22038,0.22037l21.48656,17.18925c0.98094,0.78475 2.16075,1.18519 3.35131,1.18519c0.79281,0 1.59369,-0.17738 2.3435,-0.5375c1.88125,-0.903 3.05031,-2.76275 3.05031,-4.84825v-18.82325c7.61369,-1.28731 13.4375,-7.90931 13.4375,-15.88312zM61.8125,99.4375v-5.375h5.375v5.375zM96.75,134.375c0,2.96431 -2.41069,5.375 -5.375,5.375c-2.96431,0 -5.375,-2.41069 -5.375,-5.375v-16.125h10.75zM80.625,112.875c-4.44513,0 -8.0625,-3.61738 -8.0625,-8.0625v-16.125c0,-4.44513 3.61737,-8.0625 8.0625,-8.0625h29.5625v32.25h-8.0625zM137.05175,131.46175l-21.48925,-17.19462v-35.04231l10.75,-8.59194v26.11713h5.375v-30.41175l5.375,-4.29462l0.00538,69.42887c0,0 -0.00538,-0.00269 -0.01613,-0.01075zM142.4375,107.11837v-20.73675c4.6225,1.20131 8.0625,5.375 8.0625,10.36838c0,4.99337 -3.44,9.16706 -8.0625,10.36838z" fill="url(#color-2_43971_gr2)"></path><path d="M77.9375,91.375v5.375h5.375v-5.375h5.375v-5.375h-5.375c-2.96431,0 -5.375,2.41069 -5.375,5.375z" fill="url(#color-3_43971_gr3)"></path><path d="M21.5,107.5v-67.1875c0,-4.44512 3.61737,-8.0625 8.0625,-8.0625h88.6875c4.44512,0 8.0625,3.61738 8.0625,8.0625v10.75h5.375v-10.75c0,-7.40944 -6.02806,-13.4375 -13.4375,-13.4375h-88.6875c-7.40944,0 -13.4375,6.02806 -13.4375,13.4375v67.1875c0,7.40944 6.02806,13.4375 13.4375,13.4375h32.25v-5.375h-32.25c-4.44513,0 -8.0625,-3.61737 -8.0625,-8.0625z" fill="url(#color-4_43971_gr4)"></path><path d="M32.25,43h37.625v5.375h-37.625z" fill="url(#color-5_43971_gr5)"></path><path d="M32.25,53.75h37.625v5.375h-37.625z" fill="url(#color-6_43971_gr6)"></path><path d="M32.25,64.5h26.875v5.375h-26.875z" fill="url(#color-7_43971_gr7)"></path><path d="M32.25,75.25h21.5v5.375h-21.5z" fill="url(#color-8_43971_gr8)"></path></g></g></svg>
+                                                        </div>
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps m-b-5">Announcements</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </template>
+                    </div>
+                </div>
+            </div>
+            <div class="col bg-master-lightest p-l-25 p-r-25 p-t-15 p-b-15">
+                <div class="row tabsContainer tabContent" tab-name="profile">
+                    <div class="col">
+                        <div class="row">
+                            <div class="col">
+                                <div class="row m-b-25">
+                                    <div class="col p-b-15 b-b b-grey">
+                                        <div class="font-heading all-caps fs-10 hint-text">
+                                            Account Settings
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <div class="row no-margin ">
+                                            <div class="col parentContainer">
+                                                <user-profile-component></user-profile-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <template v-if="$store.getters.isSuperAdmin">
+                    <div class="row tabsContainer hide tabContent" tab-name="team">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('accountsSection')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('accountsSection')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text">
+                                                Admin Accounts
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                <i class="fa fa-plus m-r-5"></i>
+                                                Add Admin Account
+                                            </button>
+                                            <modal-form-component section="accountsSection">
+                                                <template slot="form" slot-scope="{section}">
+                                                    <user-form-component :section="section"></user-form-component>
+                                                </template>
+                                            </modal-form-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <list-component section="accountsSection" :endpoint="route('api.account.user.list')" :options="{'type': 2}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <user-component :data="data"></user-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row tabsContainer hide tabContent" tab-name="standardSegment">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('suppliersSection')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('suppliersSection')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12 hint-text">
+                                                Service Configuration
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <div class="row align-items-center parentContainer">
+                                                <div class="col-auto m-r-50">
+                                                    <div class="row m-b-5">
+                                                        <div class="col">
+                                                            <div class="font-heading fs-9 all-caps muted">Payment Attempt Duration Limit</div>
+                                                        </div>
+                                                    </div>
+                                                    <payment-attempt-component :segment_id="1"></payment-attempt-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20 parentContainer">
+                                        <div class="col">
+                                            <div class="row align-items-center m-l-0 m-r-0 m-b-10 p-b-5 b-b b-grey">
+                                                <div class="col p-l-0">
+                                                    <div class="font-heading all-caps fs-10 hint-text muted">
+                                                        Exchange Services
+                                                    </div>
+                                                </div>
+                                                <div class="col-auto p-r-0">
+                                                    <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                        <i class="fa fa-plus m-r-5"></i>
+                                                        Create New Service
+                                                    </button>
+                                                    <modal-form-component size="large" section="serviceTypeSection">
+                                                        <template slot="form" slot-scope="{section}">
+                                                            <service-form-component :section="section"></service-form-component>
+                                                        </template>
+                                                    </modal-form-component>
+                                                </div>
+                                            </div>
+                                            <list-component section="serviceTypeSection" :endpoint="route('api.service_type.list')">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <service-component :data="data"></service-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row tabsContainer hide tabContent" tab-name="customSegment">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('segmentsSection')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('segmentsSection')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text">
+                                                Custom Segments
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                <i class="fa fa-plus m-r-5"></i>
+                                                Create Segment
+                                            </button>   
+                                            <modal-form-component section="segmentsSection">
+                                                <template slot="form" slot-scope="{section}">
+                                                    <segment-form-component :section="section"></segment-form-component>
+                                                </template>
+                                            </modal-form-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <list-component section="segmentsSection" :endpoint="route('api.segment.list')" :options="{'type': 2}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <segment-component :data="data"></segment-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row tabsContainer hide tabContent" tab-name="announcement">
+                        <div class="col">
+                            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('announcementsSection')"></loading-component>
+                            <div class="row" v-show="!$store.getters.isLoading('announcementsSection')">
+                                <div class="col">
+                                    <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-10 hint-text">
+                                                Announcements
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                <i class="fa fa-plus m-r-5"></i>
+                                                Create Announcement
+                                            </button>
+                                            <modal-form-component section="allAnnouncementsSection">
+                                                <template slot="form" slot-scope="{section}">
+                                                    <announcement-form-component :section="section"></announcement-form-component>
+                                                </template>
+                                            </modal-form-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <list-component section="allAnnouncementsSection" :endpoint="route('api.announcement.list')" :options="{}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <announcement-list-component :data="data"></announcement-list-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index d3a15ad2..685d3f27 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -17,6 +17,15 @@
                     </div>
                 </div>
             </div>
+            <div class="col-auto m-r-5 d-none d-md-inline">
+                <a href="{{route('settings')}}">
+                    <div class="row align-items-center justify-content-center b-a b-thick h-100" style="border-color: #ffffff3d">
+                        <div class="col p-r-10 p-l-10">
+                            <i class="fa fa-cog fs-18 m-t-5 muted"></i>
+                        </div>
+                    </div>
+                </a>
+            </div>
             <div class="col-auto p-r-20 d-none d-md-inline">
                 <logout-component></logout-component>
             </div>
diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php
index c32eb3df..cf62bda3 100644
--- a/resources/views/partials/menu.blade.php
+++ b/resources/views/partials/menu.blade.php
@@ -129,6 +129,14 @@
                                 <a href="{{route('template.shipping-queue')}}"><h6 class="no-margin light fs-18 all-caps">Shipping Queue</h6></a>
                             </div>
                         </div>
+                        <div class="row p-t-15 p-b-15 align-items-center justify-content-center d-md-none">
+                            <div class="col-auto p-r-0">
+                                <i class="fa fa-cog fs-25 m-t-5 text-dark"></i>
+                            </div>
+                            <div class="col">
+                                <a href="{{route('settings')}}"><h6 class="no-margin light fs-18 all-caps">Settings</h6></a>
+                            </div>
+                        </div>
                         <div class="row p-t-15 p-b-15 justify-content-center d-md-none">
                             <div class="col">
                                 <logout-component></logout-component>
diff --git a/routes/api.php b/routes/api.php
index b53b1b95..c8f886e1 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -52,6 +52,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         require __DIR__ . '/segment.php';
 
+        require __DIR__ . '/announcement.php';
+
         Route::get('/report/customer/{marking}/{from?}/{to?}', 'Reports\MonthlyReportController@customerReport')->name('report.customer');
         Route::get('/report/sales/{from?}/{to?}', 'Reports\MonthlyReportController@salesReport')->name('report.sales');
         Route::get('/report/profit/{model}/{value}/{from?}/{to?}', 'Reports\MonthlyReportController@profitModelReport')->name('report.profit');
diff --git a/routes/company.php b/routes/company.php
index 7d898117..55c731b2 100644
--- a/routes/company.php
+++ b/routes/company.php
@@ -9,6 +9,8 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
     Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
 
+    Route::post('/team/create', 'AddNewMemberController@create')->name('team.create');
+
     Route::group(['prefix' => '{id}/segment', 'as' => 'segment.'], function () {
         Route::post('/assign', 'AssignCompanyToSegmentController@assign')->name('assign');
         Route::delete('/detach/{segment_id}', 'RemoveCompanyFromSegmentController@detach')->name('detach');
diff --git a/routes/segment.php b/routes/segment.php
index edde7247..1607b0a6 100644
--- a/routes/segment.php
+++ b/routes/segment.php
@@ -5,4 +5,15 @@ use Illuminate\Support\Facades\Route;
 Route::group(['prefix' => 'segment', 'as' => 'segment.', 'namespace' => 'Segments'], function () {
     Route::post('/create', 'CreateSegmentController@create')->name('create');
     Route::delete('/delete/{id}', 'DeleteSegmentController@destroy')->name('delete');
+    Route::get('/{id}/show', 'FetchSegmentController@fetch')->name('show');
+    Route::post('/create', 'CreateSegmentController@create')->name('create');
+    Route::put('/update/{id}', 'UpdateSegmentController@update')->name('update');
+    Route::delete('/delete/{id}', 'DeleteSegmentController@destroy')->name('delete');
+    Route::get('/list', 'ListSegmentsController@list')->name('list');
+
+    Route::group(['prefix' => '{id}/constant', 'as' => 'constant.'], function () {
+        Route::put('/service/update', 'UpdateCustomServiceConstantController@update')->name('service.update');
+        Route::put('/update', 'UpdateConstantController@update')->name('update');
+        Route::get('/show/{reference}', 'FetchConstantController@fetch')->name('show');
+    });
 });
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index c7654a08..0d789d35 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -187,3 +187,6 @@ Route::get('/yd', function (){
 Route::get('/export/customer-latest-order-date/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
 Route::get('/export/packing-list/{id}', 'Exports\ExportContainerPackingListController@export')->name('container.packaging_list.export');
 
+Route::get('/settings', function () {
+    return view('pages.settings');
+})->name('settings');