diff --git a/src/main/java/dgpena/siexample/webapp/EmployeesVM.java b/src/main/java/dgpena/siexample/webapp/EmployeesVM.java
new file mode 100644
index 0000000000000000000000000000000000000000..bd6e852c29bc167e3963504ceaf3d07009a49264
--- /dev/null
+++ b/src/main/java/dgpena/siexample/webapp/EmployeesVM.java
@@ -0,0 +1,91 @@
+package dgpena.siexample.webapp;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+
+import org.zkoss.bind.annotation.BindingParam;
+import org.zkoss.bind.annotation.Command;
+import org.zkoss.bind.annotation.Init;
+import org.zkoss.bind.annotation.NotifyChange;
+
+import dgpena.siexample.persistence.Department;
+import dgpena.siexample.persistence.Departments;
+import dgpena.siexample.persistence.Employee;
+import dgpena.siexample.persistence.Employees;
+
+public class EmployeesVM {
+
+	private EntityManager em;
+	private Employees employees;
+	private Departments departments;
+	
+	private boolean isEditing = false;
+	
+	// Employee under edition...
+	private Employee currentEmployee;
+	
+	@Init
+	public void init() {
+		this.em = DesktopEntityManagerManager.getDesktopEntityManager();
+		this.employees = new Employees(em);
+		this.departments = new Departments(em);
+	}
+	
+	public List<Employee> getEmployees() {
+		return this.employees.findAll();
+	}
+	
+	public List<Department> getDepartments() {
+		return this.departments.findAll();
+	}
+	
+	public Employee getCurrentEmployee() {
+		return currentEmployee;
+	}
+	
+	public void setCurrentEmployee(Employee currentEmployee) {
+		this.currentEmployee = currentEmployee;
+	}
+	
+	@Command
+	@NotifyChange("currentEmployee")
+	public void newEmployee() {
+		this.isEditing = false;
+		this.currentEmployee = new Employee();
+	}
+	
+	@Command
+	@NotifyChange("currentEmployee")
+	public void resetEditing() {
+		this.currentEmployee = null;
+	}
+	
+	@Command
+	@NotifyChange({"currentEmployee", "employees"})
+	public void saveEmployee() {
+		
+		this.em.getTransaction().begin();
+			if (!isEditing) {
+				this.employees.addNewEmployee(this.currentEmployee);
+			}
+		this.em.getTransaction().commit();
+		
+		this.currentEmployee = null;
+	}
+	
+	@Command
+	@NotifyChange("employees")
+	public void delete(@BindingParam("e") Employee Employee) {
+		this.em.getTransaction().begin();
+		this.employees.deleteEmployee(Employee);
+		this.em.getTransaction().commit();
+	}
+	
+	@Command
+	@NotifyChange("currentEmployee")
+	public void edit(@BindingParam("e") Employee Employee) {
+		this.isEditing = true;
+		this.currentEmployee = Employee;
+	}
+}
diff --git a/src/main/webapp/edit_employees.zul b/src/main/webapp/edit_employees.zul
new file mode 100644
index 0000000000000000000000000000000000000000..b267efed73f5bc3a799d4f20fd0eae23c8407f3b
--- /dev/null
+++ b/src/main/webapp/edit_employees.zul
@@ -0,0 +1,50 @@
+<zk>
+	<window title="Employees" border="normal"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('dgpena.siexample.webapp.EmployeesVM')"
+	>
+	
+	<window title="Employee Editor" mode="modal" visible="@load(vm.currentEmployee ne null)">
+		Name: <textbox value="@load(vm.currentEmployee.name) @save(vm.currentEmployee.name, before='saveEmployee')"></textbox>
+		Department:
+		<combobox model="@bind(vm.departments)" selectedItem="@load(vm.currentEmployee.department) @save(vm.currentEmployee.department, before='saveEmployee')">
+			<template name="model">
+				<comboitem label="@bind(each.name)"></comboitem>
+			</template>
+		</combobox>
+		<hbox>
+			<button label="accept" onClick="@command('saveEmployee')"></button>
+			<button label="cancel" onClick="@command('resetEditing')"></button>
+		</hbox>
+	
+	</window>
+	<groupbox mold="3d" closable="false">
+		<caption label="Employees list">
+			<button label="new" onClick="@command('newEmployee')"></button>
+		</caption>
+		<listbox model="@bind(vm.employees)">
+			<listhead>
+				<listheader label="name"></listheader>
+				<listheader label="department"></listheader>
+				<listheader label="actions"></listheader>
+			</listhead>
+			
+			<template name="model">
+				<listitem>
+					<listcell><label value="@bind(each.name)"></label></listcell>
+					<listcell><label value="@bind(each.department.name)"></label></listcell>
+					
+					<listcell>
+						<button label="edit" onClick="@command('edit', e=each)"></button>
+						<button label="delete" onClick="@command('delete', e=each)"></button>
+					
+					
+					</listcell>
+				</listitem>
+			</template>
+		
+		</listbox>
+	</groupbox>
+	</window>
+</zk>
+	
\ No newline at end of file