diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..12937e5
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="owner.project.facets" value="jboss.m2"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.project b/.project
new file mode 100644
index 0000000..4ba0c0e
--- /dev/null
+++ b/.project
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>wildfly-kitchensink-angularjs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>tern.eclipse.ide.core.ternBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.jboss.tools.cdi.core.cdibuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.jboss.tools.ws.jaxrs.metamodelBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.hibernate.eclipse.console.hibernateBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+		<nature>org.jboss.tools.cdi.core.cdinature</nature>
+		<nature>org.hibernate.eclipse.console.hibernateNature</nature>
+		<nature>org.jboss.tools.ws.jaxrs.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.tern-project b/.tern-project
new file mode 100644
index 0000000..b6f48dd
--- /dev/null
+++ b/.tern-project
@@ -0,0 +1 @@
+{"ide":{},"libs":["ecma5","browser"],"plugins":{"guess-types":{},"angular":{}}}
\ No newline at end of file
diff --git a/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberRepository.java b/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberRepository.java
index 2a89ce3..85aa5fb 100644
--- a/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberRepository.java
+++ b/src/main/java/org/jboss/as/quickstarts/kitchensink/data/MemberRepository.java
@@ -46,6 +46,14 @@ public Member findByEmail(String email) {
         criteria.select(member).where(cb.equal(member.get("email"), email));
         return em.createQuery(criteria).getSingleResult();
     }
+    
+    public Member findByName(String name) {
+        CriteriaBuilder cb = em.getCriteriaBuilder();
+        CriteriaQuery<Member> criteria = cb.createQuery(Member.class);
+        Root<Member> member = criteria.from(Member.class);
+        criteria.select(member).where(cb.equal(member.get("name"), name));
+        return em.createQuery(criteria).getSingleResult();
+    }
 
     public List<Member> findAllOrderedByName() {
         CriteriaBuilder cb = em.getCriteriaBuilder();
diff --git a/src/main/java/org/jboss/as/quickstarts/kitchensink/model/Member.java b/src/main/java/org/jboss/as/quickstarts/kitchensink/model/Member.java
index d2ccaa6..43063e9 100644
--- a/src/main/java/org/jboss/as/quickstarts/kitchensink/model/Member.java
+++ b/src/main/java/org/jboss/as/quickstarts/kitchensink/model/Member.java
@@ -58,8 +58,21 @@ public class Member implements Serializable {
     @Digits(fraction = 0, integer = 12)
     @Column(name = "phone_number")
     private String phoneNumber;
-
-    public Long getId() {
+    
+    @NotNull
+    @NotEmpty
+    @Column
+    private String address;
+   
+    public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public Long getId() {
         return id;
     }
 
diff --git a/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/MemberResourceRESTService.java b/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/MemberResourceRESTService.java
index a74c537..f3a0656 100644
--- a/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/MemberResourceRESTService.java
+++ b/src/main/java/org/jboss/as/quickstarts/kitchensink/rest/MemberResourceRESTService.java
@@ -96,9 +96,9 @@ public Response createMember(Member member) {
         try {
             // Validates member using bean validation
             validateMember(member);
-
+            
             registration.register(member);
-
+            
             // Create an "ok" response
             builder = Response.ok();
         } catch (ConstraintViolationException ce) {
@@ -107,7 +107,12 @@ public Response createMember(Member member) {
         } catch (ValidationException e) {
             // Handle the unique constrain violation
             Map<String, String> responseObj = new HashMap<>();
-            responseObj.put("email", "Email taken");
+            if(emailAlreadyExists(member.getEmail())){
+            	responseObj.put("email", "Email taken");
+            }
+            if(nameAlreadyExists(member.getName())){
+            	responseObj.put("name", "Name taken");
+            }
             builder = Response.status(Response.Status.CONFLICT).entity(responseObj);
         } catch (Exception e) {
             // Handle generic exceptions
@@ -145,6 +150,9 @@ private void validateMember(Member member) throws ConstraintViolationException,
         if (emailAlreadyExists(member.getEmail())) {
             throw new ValidationException("Unique Email Violation");
         }
+        if (nameAlreadyExists(member.getName())) {
+            throw new ValidationException("Unique Name Violation");
+        }
     }
 
     /**
@@ -182,4 +190,20 @@ public boolean emailAlreadyExists(String email) {
         }
         return member != null;
     }
+    /**
+     * Checks if a member with the same name address is already registered. This is the only way to easily capture the
+     * "@UniqueConstraint(columnNames = "name")" constraint from the Member class.
+     *
+     * @param name The email to check
+     * @return True if the name already exists, and false otherwise
+     */
+    public boolean nameAlreadyExists(String name) {
+        Member member = null;
+        try {
+            member = repository.findByName(name);
+        } catch (NoResultException e) {
+            // ignore
+        }
+        return member != null;
+    }
 }
diff --git a/src/main/webapp/partials/home.html b/src/main/webapp/partials/home.html
index 5433edd..e1edecd 100644
--- a/src/main/webapp/partials/home.html
+++ b/src/main/webapp/partials/home.html
@@ -46,6 +46,11 @@ <h2>Member Registration</h2>
                 <input type="tel" name="phoneNumber" id="phoneNumber" ng-model="newMember.phoneNumber" pattern="[0-9]{10,12}" placeholder="Your Phone #" required/>
                 <span class="error" ng-show="errors.phoneNumber">{{errors.phoneNumber}}</span>
             </div>
+            <div>
+                <label for="address">Address #:</label>
+                <input type="text" name="address" id="address" ng-model="newMember.address" placeholder="Your address #" required/>
+                <span class="error" ng-show="errors.address">{{errors.address}}</span>
+            </div>
 
             <!-- We output a list of success messages (appropriately styled!) for the form. -->
             <ul ng-hide="!successMessages" class="success">
@@ -77,6 +82,7 @@ <h2>Members</h2>
                 <th>Name</th>
                 <th>Email</th>
                 <th>Phone #</th>
+                <th>Address #</th>
                 <th>REST URL</th>
             </tr>
         </thead>
@@ -86,6 +92,7 @@ <h2>Members</h2>
             <td>{{member.name}}</td>
             <td>{{member.email}}</td>
             <td>{{member.phoneNumber}}</td>
+            <td>{{member.address}}</td>
             <td><a href="rest/members/{{member.id}}">/rest/members/{{member.id}}</a>
             </td>
     </table>