diff --git a/app/resources/routes/api/inmobiliarias/proveedores.php b/app/resources/routes/api/inmobiliarias/proveedores.php
index 306c496..6221b72 100644
--- a/app/resources/routes/api/inmobiliarias/proveedores.php
+++ b/app/resources/routes/api/inmobiliarias/proveedores.php
@@ -3,10 +3,11 @@ use Incoviba\Controller\API\Inmobiliarias\Proveedores;
 
 $app->group('/proveedores', function($app) {
     $app->post('/add[/]', [Proveedores::class, 'add']);
+    $app->post('/edit[/]', [Proveedores::class, 'edit']);
     //$app->post('/register[/]', [Proveedores::class, 'register']);
     $app->get('[/]', Proveedores::class);
 });
 $app->group('/proveedor/{proveedor_rut:[0-9]+}', function($app) {
-    $app->post('/edit[/]', [Proveedores::class, 'edit']);
     $app->delete('/delete[/]', [Proveedores::class, 'delete']);
+    $app->get('[/]', [Proveedores::class, 'get']);
 });
diff --git a/app/resources/views/inmobiliarias/proveedores.blade.php b/app/resources/views/inmobiliarias/proveedores.blade.php
index 0fe7d25..1e96b13 100644
--- a/app/resources/views/inmobiliarias/proveedores.blade.php
+++ b/app/resources/views/inmobiliarias/proveedores.blade.php
@@ -34,6 +34,8 @@
     </div>
 
     @include('inmobiliarias.proveedores.add_modal')
+
+    @include('inmobiliarias.proveedores.edit_modal')
 @endsection
 
 @include('layout.body.scripts.rut')
@@ -66,14 +68,12 @@
                 proveedores: ''
             },
             data: JSON.parse('{!! json_encode($proveedores) !!}'),
-            edit() {
-            },
             remove() {
                 return {
                     proveedor: rut => {
                         const url = `{{$urls->api}}/inmobiliarias/proveedor/${rut}/delete`
                         const method = 'delete'
-                        APIClient.fetch(url, {method})
+                        return APIClient.fetch(url, {method})
                             .then(response => (response) ? response.json() : null)
                             .then(data => {
                                 if (data.success) {
@@ -84,32 +84,6 @@
                     }
                 }
             },
-            draw() {
-                return {
-                    proveedores: () => {
-                        $(this.ids.proveedores).empty()
-                        this.data.forEach(proveedor => {
-                            $(this.ids.proveedores).append(`
-                            <tr>
-                                <td>${proveedor.nombre}</td>
-                                <td>${proveedor.contacto.nombreCompleto}</td>
-                                <td class="right aligned">
-                                    <button class="ui icon button" data-proveedor="${proveedor.rut}">
-                                        <i class="edit icon"></i>
-                                    </button>
-                                    <button class="ui red icon button" data-proveedor="${proveedor.rut}">
-                                        <i class="remove icon"></i>
-                                    </button>
-                                </td>
-                            </tr>
-                            `)
-                        })
-                        $(this.ids.buttons.remove).click((e) => {
-                            this.remove().proveedor($(e.target).data('proveedor'))
-                        })
-                    }
-                }
-            },
             formatters() {
                 return {
                     rut: value => {
@@ -130,8 +104,22 @@
                 $(this.ids.buttons.add).click(() => {
                     addModal.show()
                 })
+                const editModal = new EditModal(this.ids.edit, this.formatters())
+                $(this.ids.buttons.edit).click((e) => {
+                    e.currentTarget.classList.add('loading')
+                    e.currentTarget.classList.add('spinner')
+                    editModal.show(e.currentTarget.parentNode.dataset.proveedor).then(() => {
+                        e.currentTarget.classList.remove('loading')
+                        e.currentTarget.classList.remove('spinner')
+                    })
+                })
                 $(this.ids.buttons.remove).click((e) => {
-                    this.remove().proveedor(e.currentTarget.parentNode.dataset.proveedor)
+                    e.currentTarget.classList.add('loading')
+                    e.currentTarget.classList.add('spinner')
+                    this.remove().proveedor(e.currentTarget.parentNode.dataset.proveedor).then(() => {
+                        e.currentTarget.classList.remove('loading')
+                        e.currentTarget.classList.remove('spinner')
+                    })
                 })
             }
         }
@@ -159,6 +147,23 @@
                         telefono: '#telefono_contacto'
                     }
                 },
+                edit: {
+                    modal: '#edit_modal',
+                    form: 'edit_form',
+                    rut: '#edit_rut',
+                    digito: '#edit_digito',
+                    nombre: '#edit_nombre',
+                    razon: '#edit_razon',
+                    contacto: {
+                        rut: '#edit_rut_contacto',
+                        digito: '#edit_digito_contacto',
+                        nombres: '#edit_nombre_contacto',
+                        apellido_paterno: '#edit_apellido_paterno_contacto',
+                        apellido_materno: '#edit_apellido_materno_contacto',
+                        email: '#edit_email_contacto',
+                        telefono: '#edit_telefono_contacto'
+                    }
+                },
                 proveedores: '#proveedores'
             })
         })
diff --git a/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php b/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
index d0bea75..db1e816 100644
--- a/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
+++ b/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
@@ -1,4 +1,5 @@
 <div class="ui modal" id="add_modal">
+    <div class="header">Agregar Proveedor</div>
     <div class="content">
         <form class="ui form" id="add_form">
             <div class="three wide field">
diff --git a/app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php b/app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php
new file mode 100644
index 0000000..8471a83
--- /dev/null
+++ b/app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php
@@ -0,0 +1,158 @@
+<div class="ui modal" id="edit_modal">
+    <div class="header">Editar Proveedor <span class="proveedor"></span></div>
+    <div class="content">
+        <form class="ui form" id="edit_form">
+            <div class="three wide field">
+                <label for="edit_rut">RUT</label>
+                <div class="ui right labeled input">
+                    <input class="right aligned" type="text" id="edit_rut" name="rut" placeholder="RUT" maxlength="10"
+                           required/>
+                    <div class="ui basic label">-<span id="edit_digito"></span></div>
+                </div>
+            </div>
+            <div class="five wide field">
+                <label for="edit_nombre">Nombre</label>
+                <input type="text" id="edit_nombre" name="nombre" placeholder="Nombre" required/>
+            </div>
+            <div class="field">
+                <label for="edit_razon">Razón Social</label>
+                <input type="text" id="edit_razon" name="razon" placeholder="Razón Social" required/>
+            </div>
+            <div class="ui divider">Contacto</div>
+            <div class="three wide field">
+                <label for="edit_rut_contacto">RUT</label>
+                <div class="ui right labeled input">
+                    <input type="text" id="edit_rut_contacto" name="rut_contacto" placeholder="RUT" maxlength="10"
+                           required/>
+                    <div class="ui basic label">-<span id="edit_digito_contacto"></span></div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="five wide field">
+                    <label for="edit_nombre_contacto">Nombre</label>
+                    <input type="text" id="edit_nombre_contacto" name="nombre_contacto" placeholder="Nombre" required/>
+                </div>
+                <div class="field">
+                    <label for="edit_apellido_paterno_contacto">Apellido Paterno</label>
+                    <input type="text" id="edit_apellido_paterno_contacto" name="apellido_paterno_contacto"
+                           placeholder="Apellido Paterno" required/>
+                </div>
+                <div class="field">
+                    <label for="edit_apellido_materno_contacto">Apellido Materno</label>
+                    <input type="text" id="edit_apellido_materno_contacto" name="apellido_materno_contacto"
+                           placeholder="Apellido Materno"/>
+                </div>
+            </div>
+            <div class="field">
+                <label for="edit_email_contacto">Email</label>
+                <input type="email" id="edit_email_contacto" name="email_contacto" placeholder="Email"/>
+            </div>
+            <div class="field">
+                <label for="edit_telefono_contacto">Teléfono</label>
+                <div class="ui left labeled input">
+                    <div class="ui basic label">+56</div>
+                    <input type="text" id="edit_telefono_contacto" name="telefono_contacto" placeholder="Teléfono"/>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="actions">
+        <button class="ui green approve button">Guardar</button>
+    </div>
+</div>
+
+@push('page_scripts')
+    <script>
+        class EditModal {
+            props
+            data
+            constructor(props, formatter) {
+                this.props = props
+                this.setup(formatter)
+            }
+            show(id) {
+                return this.load(id).then(() => {
+                    $(this.props.modal).find('.proveedor').html(this.data.nombre)
+                    const form = document.getElementById(this.props.form)
+                    form.querySelector(this.props.rut).value = this.data.rut
+                    form.querySelector(this.props.digito).textContent = Rut.digitoVerificador(this.data.rut)
+                    form.querySelector(this.props.nombre).value = this.data.nombre
+                    form.querySelector(this.props.razon).value = this.data.razon
+                    form.querySelector(this.props.contacto.rut).value = this.data.contacto.rut
+                    form.querySelector(this.props.contacto.digito).textContent = Rut.digitoVerificador(this.data.contacto.rut)
+                    form.querySelector(this.props.contacto.nombres).value = this.data.contacto.nombres
+                    form.querySelector(this.props.contacto.apellido_paterno).value = this.data.contacto.apellidoPaterno
+                    form.querySelector(this.props.contacto.apellido_materno).value = this.data.contacto.apellidoMaterno
+                    form.querySelector(this.props.contacto.email).value = this.data.contacto.datos.email
+                    form.querySelector(this.props.contacto.telefono).value = this.data.contacto.datos.telefono
+
+                    $(this.props.modal).modal('show')
+                })
+            }
+            load(id) {
+                const url = `{{$urls->api}}/inmobiliarias/proveedor/${id}`
+                return APIClient.fetch(url).then(response => response.json()).then(json => {
+                    this.data = json.proveedor
+                })
+            }
+            edit() {
+                const form = document.getElementById(this.props.form)
+                const data = {
+                    rut: form.querySelector(this.props.rut).value.replace(/\D/g, ''),
+                    digito: form.querySelector(this.props.digito).textContent,
+                    nombre: form.querySelector(this.props.nombre).value,
+                    razon: form.querySelector(this.props.razon).value,
+                    contacto: {
+                        rut: form.querySelector(this.props.contacto.rut).value.replace(/\D/g, ''),
+                        digito: form.querySelector(this.props.contacto.digito).textContent,
+                        nombres: form.querySelector(this.props.contacto.nombres).value,
+                        apellido_paterno: form.querySelector(this.props.contacto.apellido_paterno).value,
+                        apellido_materno: form.querySelector(this.props.contacto.apellido_materno).value,
+                        email: form.querySelector(this.props.contacto.email).value,
+                        telefono: form.querySelector(this.props.contacto.telefono).value.replace(/\D/g, ''),
+                    }
+                }
+                const body = new FormData()
+                body.append('proveedores[]', JSON.stringify(data))
+                const url = '{{$urls->api}}/inmobiliarias/proveedores/edit'
+                const method = 'post'
+                return APIClient.fetch(url, {method, body}).then(response => response.json()).then(json => {
+                    if (json.success.filter(s => s).length > 0) {
+                        window.location.reload()
+                    }
+                })
+            }
+            setup(formatter) {
+                $(this.props.modal).modal({
+                    onApprove: () => {
+                        this.edit()
+                    }
+                })
+
+                const form = document.getElementById(this.props.form)
+                form.querySelector(this.props.rut).addEventListener('input', (e) => {
+                    e.currentTarget.value = formatter.rut(e.currentTarget.value)
+                    form.querySelector(this.props.digito).textContent = Rut.digitoVerificador(e.currentTarget.value)
+                })
+                if (form.querySelector(this.props.rut).value.length > 0) {
+                    form.querySelector(this.props.rut).value = formatter.rut(form.querySelector(this.props.rut).value)
+                    form.querySelector(this.props.digito).textContent = Rut.digitoVerificador(form.querySelector(this.props.rut).value)
+                }
+                form.querySelector(this.props.contacto.rut).addEventListener('input', (e) => {
+                    e.currentTarget.value = formatter.rut(e.currentTarget.value)
+                    form.querySelector(this.props.contacto.digito).textContent = Rut.digitoVerificador(e.currentTarget.value)
+                })
+                if (form.querySelector(this.props.contacto.rut).value.length > 0) {
+                    form.querySelector(this.props.contacto.rut).value = formatter.rut(form.querySelector(this.props.contacto.rut).value)
+                    form.querySelector(this.props.contacto.digito).textContent = Rut.digitoVerificador(form.querySelector(this.props.contacto.rut).value)
+                }
+                form.querySelector(this.props.contacto.telefono).addEventListener('input', (e) => {
+                    e.currentTarget.value = formatter.telefono(e.currentTarget.value)
+                })
+                if (form.querySelector(this.props.contacto.telefono).value.length > 0) {
+                    form.querySelector(this.props.contacto.telefono).value = formatter.telefono(form.querySelector(this.props.contacto.telefono).value)
+                }
+            }
+        }
+    </script>
+@endpush
diff --git a/app/src/Controller/API/Inmobiliarias/Proveedores.php b/app/src/Controller/API/Inmobiliarias/Proveedores.php
index 572ccc0..bd1d265 100644
--- a/app/src/Controller/API/Inmobiliarias/Proveedores.php
+++ b/app/src/Controller/API/Inmobiliarias/Proveedores.php
@@ -22,6 +22,18 @@ class Proveedores extends Ideal\Controller
         } catch (Implement\Exception\EmptyResult) {}
         return $this->withJson($response, $output);
     }
+    public function get(ServerRequestInterface $request, ResponseInterface $response,
+                        Service\Inmobiliaria\Proveedor $proveedorService, int $proveedor_rut): ResponseInterface
+    {
+        $output = [
+            'proveedor_rut' => $proveedor_rut,
+            'proveedor' => null,
+        ];
+        try {
+            $output['proveedor'] = $proveedorService->getById($proveedor_rut);
+        } catch (Implement\Exception\EmptyResult) {}
+        return $this->withJson($response, $output);
+    }
     public function add(ServerRequestInterface $request, ResponseInterface $response,
                         Service\Inmobiliaria\Proveedor $proveedorService): ResponseInterface
     {
@@ -54,7 +66,8 @@ class Proveedores extends Ideal\Controller
         foreach ($input['proveedores'] as $json) {
             $data = json_decode($json, true);
             try {
-                $output['proveedores'] []= $proveedorService->edit($data);
+                $proveedor = $proveedorService->getById($data['rut']);
+                $output['proveedores'] []= $proveedorService->edit($proveedor, $data);
                 $output['success'] []= true;
             } catch (Implement\Exception\EmptyResult) {
                 $output['success'] []= false;
diff --git a/app/src/Repository/Persona.php b/app/src/Repository/Persona.php
index 89f2b15..52ba83c 100644
--- a/app/src/Repository/Persona.php
+++ b/app/src/Repository/Persona.php
@@ -30,18 +30,9 @@ class Persona extends Ideal\Repository
     }
     public function edit(Define\Model $model, array $new_data): Model\Persona
     {
-        return $this->update($model, $new_data, ['rut', 'digito', 'nombres', 'apellido_paterno', 'apellido_materno']);
+        return $this->update($model, ['digito', 'nombres', 'apellido_paterno', 'apellido_materno'], $new_data);
     }
 
-    /*public function fetchById(int $rut): Model\Persona
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select()
-            ->from($this->getTable())
-            ->where('rut = ?');
-        return $this->fetchOne($query, [$rut]);
-    }*/
-
     public function filterData(array $data): array
     {
         return array_intersect_key($data, array_flip(['rut', 'digito', 'nombres', 'apellido_paterno', 'apellido_materno']));
diff --git a/app/src/Repository/Persona/Datos.php b/app/src/Repository/Persona/Datos.php
index 574b4cb..1f9338d 100644
--- a/app/src/Repository/Persona/Datos.php
+++ b/app/src/Repository/Persona/Datos.php
@@ -80,9 +80,4 @@ class Datos extends Ideal\Repository
             ->where('persona_rut = ?');
         return $this->fetchOne($query, [$persona_rut]);
     }
-
-    protected function getKey(): string
-    {
-        return 'persona_rut';
-    }
 }
diff --git a/app/src/Service/Inmobiliaria/Proveedor.php b/app/src/Service/Inmobiliaria/Proveedor.php
index ea40a32..219997c 100644
--- a/app/src/Service/Inmobiliaria/Proveedor.php
+++ b/app/src/Service/Inmobiliaria/Proveedor.php
@@ -55,14 +55,22 @@ class Proveedor extends Ideal\Service
         }
     }
     /**
-     * @TODO Implement
      * @param Model\Inmobiliaria\Proveedor $proveedor
      * @param array $data
      * @return Model\Inmobiliaria\Proveedor
      */
     public function edit(Model\Inmobiliaria\Proveedor $proveedor, array $data): Model\Inmobiliaria\Proveedor
     {
-        return $proveedor;
+        $filteredData = $this->proveedorRepository->filterData($data);
+        try {
+            if ($proveedor->contacto->rut !== $data['contacto']['rut']) {
+                $contacto = $this->contactoService->getById($data['contacto']['rut']);
+                $this->contactoService->edit($contacto, $data['contacto']);
+            }
+            return $this->process($this->proveedorRepository->edit($proveedor, $filteredData));
+        } catch (Implement\Exception\EmptyResult) {
+            return $proveedor;
+        }
     }
     public function delete(Model\Inmobiliaria\Proveedor $proveedor): bool
     {
diff --git a/app/src/Service/Persona.php b/app/src/Service/Persona.php
index b87af5c..5e8244e 100644
--- a/app/src/Service/Persona.php
+++ b/app/src/Service/Persona.php
@@ -45,6 +45,17 @@ class Persona extends Ideal\Service
         }
         return $this->process($persona);
     }
+    public function edit(Model\Persona $persona, array $data): Model\Persona
+    {
+        $filteredData = $this->personaRepository->filterData($data);
+        try {
+            $datosData = $this->datosPersonaRepository->filterData($data);
+            $this->datosPersonaRepository->edit($persona->datos(), $datosData);
+            return $this->personaRepository->edit($persona, $filteredData);
+        } catch (Implement\Exception\EmptyResult) {
+            return $persona;
+        }
+    }
 
     protected function process(Model\Persona $persona): Model\Persona
     {