diff --git a/WebContent/WEB-INF/header.jsp b/WebContent/WEB-INF/header.jsp
index cbc86fe..102fb0f 100644
--- a/WebContent/WEB-INF/header.jsp
+++ b/WebContent/WEB-INF/header.jsp
@@ -4,7 +4,8 @@
             <nav id="mainNav">
                 <ul id="mainUl" class="nav nav-tabs">
                     <li class="active"><a href="#">Начало</a></li>
-                    <li><a href="#tablesPart">Въпроси</a></li>
+                    <li><a href="manager.jsp">Мениджър</a></li>
+                    <li><a href="employee.jsp">Служител</a></li>
                     <li><a href="#">Профил</a></li>
                     <li><a href="#">Портфолио</a></li>
                     <li><a href="#">За нас</a></li>
diff --git a/WebContent/WEB-INF/ideas.jsp b/WebContent/WEB-INF/ideas.jsp
new file mode 100644
index 0000000..ace49f4
--- /dev/null
+++ b/WebContent/WEB-INF/ideas.jsp
@@ -0,0 +1,32 @@
+   <div id="ideaWrapper" class="span5">
+                <a href="#modalIdea" role="button" data-toggle="modal">
+                    <img src="img/idea.png" width="400" /></a>
+
+                <div id="modalIdea" class="modal hide fade " tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                        <h3 id="H3">Пусни идея!</h3>
+                    </div>
+                    <div class="modal-body">
+                        <form class="form-horizontal">
+                            <div class="control-group">
+                                <label class="control-label" for="ideaHeadline">Заглавие на идеята</label>
+                                <div class="controls">
+                                    <input type="text" class="headlineQuestion" id="ideaHeadline" placeholder="short headline" />
+                                </div>
+                            </div>
+
+                            <div class="control-group">
+                                <label class="control-label" for="ideaDescription">Описание на идеята</label>
+                                <div class="controls">
+                                    <textarea id="ideaDescription" placeholder="idea description"></textarea>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                        <button class="btn" data-dismiss="modal" aria-hidden="true">Затвори</button>
+                        <button class="btn btn-primary">Влез!</button>
+                    </div>
+                </div>
+            </div>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/loggedHeader.jsp b/WebContent/WEB-INF/loggedHeader.jsp
index 5aee0f6..13b8e92 100644
--- a/WebContent/WEB-INF/loggedHeader.jsp
+++ b/WebContent/WEB-INF/loggedHeader.jsp
@@ -1,21 +1,27 @@
 <%@page import="eu.cointelligence.model.User"%>
 <%@page import="eu.cointelligence.controller.Constants"%>
 <header>
-	<%
-		User userInfo = (User) ((HttpSession) session)
-				.getAttribute(Constants.USER_INFO_SESSION_ATTR_NAME);
-	%>
+
+<%!User user;%>
+<%
+	user = (User) ((HttpSession) session)
+			.getAttribute(Constants.USER_INFO_SESSION_ATTR_NAME);
+%>
 	<nav id="mainNav">
-	<span>Здравей, <%=userInfo.getFullName()%></span>
+	<script>var userrmation = {};
+				userrmation.username = <%=user.getUserName()%>;
+				userrmation.avatar = <%=user.getUserName()%>; </script>
+		<span>Здравей, <%=user.getUserName()%></span>
 		<ul id="mainUl" class="nav nav-tabs">
 			<li class="active"><a href="#">Начало</a></li>
 			<li><a href="#tablesPart">Въпроси</a></li>
-			<li><a href="#">Профил</a></li>
+			<li><a href="manager.jsp">Мениджър</a></li>
+			<li><a href="employee.jsp">Служител</a></li>
 			<li><a href="#">Портфолио</a></li>
 			<li><a href="#">За нас</a></li>
 		</ul>
 		<form action="<%=Constants.LOGOUT_PAGE%>">
-			<input type="submit" class="btn btn-primary" value="Изход"/>
+			<input type="submit" class="btn btn-primary" value="Изход" />
 		</form>
 	</nav>
 	<h1>
diff --git a/WebContent/WEB-INF/questions.jsp b/WebContent/WEB-INF/questions.jsp
new file mode 100644
index 0000000..95f63dc
--- /dev/null
+++ b/WebContent/WEB-INF/questions.jsp
@@ -0,0 +1,50 @@
+
+<div id="questionWrapper" class="span5">
+
+	<a href="#modalQuestion" role="button" data-toggle="modal"> <img
+		src="img/question.png" width="400" /></a>
+
+	<div id="modalQuestion" class="modal hide fade" tabindex="-1"
+		role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-header">
+			<button type="button" class="close" data-dismiss="modal"
+				aria-hidden="true">×</button>
+			<h3 id="H2">Задай въпрос!</h3>
+		</div>
+		<div class="modal-body">
+			<form class="form-horizontal">
+				<div class="control-group">
+					<label class="control-label" for="headline">Заглавие на
+						въпроса</label>
+					<div class="controls">
+						<input type="text" class="headlineQuestion" id="headline"
+							placeholder="short headline" name="title" />
+					</div>
+				</div>
+
+				<div class="control-group">
+					<label class="control-label" for="description">Описание на
+						въпроса</label>
+					<div class="controls">
+						<textarea id="description" placeholder="description"></textarea>
+					</div>
+				</div>
+				<div class="control-group">
+					<label for="date" class="control-label">Дата на падеж</label>
+					<div class="controls">
+
+						<input type="datetime-local" id="date" />
+					</div>
+				</div>
+			</form>
+		</div>
+		<div class="modal-footer">
+			<button class="btn" data-dismiss="modal" aria-hidden="true">Затвори</button>
+			<button class="btn btn-primary">Задай въпроса!</button>
+		</div>
+	</div>
+</div>
+
+
+
+
diff --git a/WebContent/WEB-INF/questionsAndIdeas.jsp b/WebContent/WEB-INF/questionsAndIdeas.jsp
deleted file mode 100644
index 74bc1cf..0000000
--- a/WebContent/WEB-INF/questionsAndIdeas.jsp
+++ /dev/null
@@ -1,78 +0,0 @@
- <div id="qestionBaloons">
-            <div id="questionWrapper" class="span5">
-
-                <a href="#modalQuestion" role="button" data-toggle="modal">
-                    <img src="img/question.png" width="400" /></a>
-
-                <div id="modalQuestion" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                        <h3 id="H2">Задай въпрос!</h3>
-                    </div>
-                    <div class="modal-body">
-                        <form class="form-horizontal">
-                            <div class="control-group">
-                                <label class="control-label" for="headline">Заглавие на въпроса</label>
-                                <div class="controls">
-                                    <input type="text" class="headlineQuestion" id="headline" placeholder="short headline" name="title"/>
-                                </div>
-                            </div>
-
-                            <div class="control-group">
-                                <label class="control-label" for="description">Описание на въпроса</label>
-                                <div class="controls">
-                                    <textarea id="description" placeholder="description"></textarea>
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label for="date" class="control-label">Дата на падеж</label>
-                                <div class="controls">
-
-                                    <input type="datetime-local" id="date" />
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                        <button class="btn" data-dismiss="modal" aria-hidden="true">Затвори</button>
-                        <button class="btn btn-primary">Задай въпроса!</button>
-                    </div>
-                </div>
-            </div>
-
-
-
-            <div id="ideaWrapper" class="span5">
-                <a href="#modalIdea" role="button" data-toggle="modal">
-                    <img src="img/idea.png" width="400" /></a>
-
-                <div id="modalIdea" class="modal hide fade " tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                        <h3 id="H3">Пусни идея!</h3>
-                    </div>
-                    <div class="modal-body">
-                        <form class="form-horizontal">
-                            <div class="control-group">
-                                <label class="control-label" for="ideaHeadline">Заглавие на идеята</label>
-                                <div class="controls">
-                                    <input type="text" class="headlineQuestion" id="ideaHeadline" placeholder="short headline" />
-                                </div>
-                            </div>
-
-                            <div class="control-group">
-                                <label class="control-label" for="ideaDescription">Описание на идеята</label>
-                                <div class="controls">
-                                    <textarea id="ideaDescription" placeholder="idea description"></textarea>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                        <button class="btn" data-dismiss="modal" aria-hidden="true">Затвори</button>
-                        <button class="btn btn-primary">Влез!</button>
-                    </div>
-                </div>
-            </div>
-
-        </div>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/test.jsp b/WebContent/WEB-INF/test.jsp
new file mode 100644
index 0000000..4956d7e
--- /dev/null
+++ b/WebContent/WEB-INF/test.jsp
@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 8b25c11..78784fd 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -46,7 +46,7 @@
 		<init-param>
 			<description></description>
 			<param-name>exclude-uri-regex</param-name>
-			<param-value>((^/(.+)/login.jsp$)|(^/(.+)/userLogin$))</param-value>
+			<param-value>((^/(.+)/login.jsp$)|(^/(.+)/userLogin$)|(^/(.+)/index.jsp$))</param-value>
 		</init-param>
 	</filter>
 	<filter-mapping>
diff --git a/WebContent/employee.jsp b/WebContent/employee.jsp
new file mode 100644
index 0000000..a92e97d
--- /dev/null
+++ b/WebContent/employee.jsp
@@ -0,0 +1,29 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--  insert head  -->
+<%@include file="head.jsp"%>
+<!--  insert header  -->
+<%@include file="WEB-INF/loggedHeader.jsp"%>
+
+<body>
+	<div id="wrapper">
+
+		<!-- ЗА ДА ВЛЕЗЕШ В МЕНИДЖЪРСКИЯ ПАНЕЛ НАТИСНИ ГОРЕ "МЕНИДЖЪР" -->
+		<!-- ЗА ДА ВЛЕЗЕШ В СЛУЖИТЕЛСКИЯ ПАНЕЛ НАТИСНИ ГОРЕ "СЛУЖИТЕЛ" -->
+		<div id="tablesPart">
+			<%@include file="WEB-INF/ideas.jsp"%>
+			<%@include file="WEB-INF/statementsTable.jsp"%>
+
+			<!--  insert rankings table -->
+			<%@include file="WEB-INF/rankingsTable.jsp"%>
+
+			<!-- end of first section-->
+
+
+		</div>
+	</div>
+			<%@include file="WEB-INF/foot.jsp"%>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/WebContent/head.jsp b/WebContent/head.jsp
index a4cc034..ffe1314 100644
--- a/WebContent/head.jsp
+++ b/WebContent/head.jsp
@@ -1,10 +1,7 @@
 <%@page import="eu.cointelligence.model.User"%>
 <%@page import="eu.cointelligence.controller.Constants"%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="UTF-8"%>
 <head>
     <title>Home</title>
-    <meta charset="utf-8" />
 
     <link rel="stylesheet" href="styles/jquery.css" />
     <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
diff --git a/WebContent/index.jsp b/WebContent/index.jsp
index 13a4797..ff5e656 100644
--- a/WebContent/index.jsp
+++ b/WebContent/index.jsp
@@ -1,16 +1,38 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <!--  insert head  -->
 <%@include file="head.jsp"%>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8" />
+
+<%!User userInfo;%>
+<%
+	userInfo = (User) ((HttpSession) session)
+			.getAttribute(Constants.USER_INFO_SESSION_ATTR_NAME);
+%>
 <!--  insert header  -->
+<%
+	if (userInfo != null) {
+%>
 <%@include file="WEB-INF/loggedHeader.jsp"%>
+<%
+	} else {
+%>
+<%@include file="WEB-INF/header.jsp"%>
+
+<%
+	}
+%>
+
 
 <body>
 	<div id="wrapper">
 
-		<!-- insert submit questions and ideas .jsp -->
-		<%@include file="WEB-INF/questionsAndIdeas.jsp"%>
+		<!-- ЗА ДА ВЛЕЗЕШ В МЕНИДЖЪРСКИЯ ПАНЕЛ НАТИСНИ ГОРЕ "МЕНИДЖЪР" -->
+		<!-- ЗА ДА ВЛЕЗЕШ В СЛУЖИТЕЛСКИЯ ПАНЕЛ НАТИСНИ ГОРЕ "СЛУЖИТЕЛ" -->
 		<div id="tablesPart">
 			<!--  insert statements table -->
 			<%@include file="WEB-INF/statementsTable.jsp"%>
@@ -23,6 +45,7 @@
 
 		</div>
 	</div>
+	<%@include file="WEB-INF/foot.jsp"%>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/WebContent/manager.jsp b/WebContent/manager.jsp
new file mode 100644
index 0000000..a56e531
--- /dev/null
+++ b/WebContent/manager.jsp
@@ -0,0 +1,29 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--  insert head  -->
+<%@include file="head.jsp"%>
+<!--  insert header  -->
+<%@include file="WEB-INF/loggedHeader.jsp"%>
+
+<body>
+	<div id="wrapper">
+
+		<!-- ЗА ДА ВЛЕЗЕШ В МЕНИДЖЪРСКИЯ ПАНЕЛ НАТИСНИ ГОРЕ "МЕНИДЖЪР" -->
+		<!-- ЗА ДА ВЛЕЗЕШ В СЛУЖИТЕЛСКИЯ ПАНЕЛ НАТИСНИ ГОРЕ "СЛУЖИТЕЛ" -->
+		<div id="tablesPart">
+			<%@include file="WEB-INF/questions.jsp"%>
+			<%@include file="WEB-INF/statementsTable.jsp"%>
+
+			<!--  insert rankings table -->
+			<%@include file="WEB-INF/rankingsTable.jsp"%>
+
+			<!-- end of first section-->
+
+
+		</div>
+	</div>
+			<%@include file="WEB-INF/foot.jsp"%>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1ed0e65..cc3ad82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,6 @@
 			<artifactId>gson</artifactId>
 			<version>2.2.3</version>
 		</dependency>
-
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
diff --git a/src/eu/cointelligence/controller/Constants.java b/src/eu/cointelligence/controller/Constants.java
index 6de06c6..6a56400 100644
--- a/src/eu/cointelligence/controller/Constants.java
+++ b/src/eu/cointelligence/controller/Constants.java
@@ -13,5 +13,6 @@ public class Constants {
 	
 	public static final String AUTHENTICATION_FILTER_EXCLUDE_URI_REGEX_PARAM_NAME = "exclude-uri-regex";
 	public static final String INVALID_AUTHENTICATION_PAGE = "loginfail.jsp";
+	public static final Long DEFAULT_COINTELS = new Long(2000);
 
 }
\ No newline at end of file
diff --git a/src/eu/cointelligence/controller/IMarketMaker.java b/src/eu/cointelligence/controller/IMarketMaker.java
index 82a36e6..a8f771a 100644
--- a/src/eu/cointelligence/controller/IMarketMaker.java
+++ b/src/eu/cointelligence/controller/IMarketMaker.java
@@ -8,9 +8,9 @@
 public interface IMarketMaker {
 
 	// TODO javadoc
-	public abstract Map<String, Long> getStatementsAndPrices();
+	public abstract Map<Long, Long> getStatementsAndPrices();
 
-	public abstract Long getPriceForStatement(String statementId);
+	public abstract Long getPriceForStatement(Long statementId);
 
 	public abstract boolean addLog(Transaction log);
 
diff --git a/src/eu/cointelligence/controller/IPricingAlgorithm.java b/src/eu/cointelligence/controller/IPricingAlgorithm.java
index 5664ebc..7c5ab4e 100644
--- a/src/eu/cointelligence/controller/IPricingAlgorithm.java
+++ b/src/eu/cointelligence/controller/IPricingAlgorithm.java
@@ -6,5 +6,5 @@
 import eu.cointelligence.model.Transaction;
 
 public interface IPricingAlgorithm {
-	public Map<String, Long> recalculate(Map<String, Long> oldPrices, List<Transaction> logs);
+	public Map<Long, Long> recalculate(Map<Long, Long> oldPrices, List<Transaction> logs);
 }
\ No newline at end of file
diff --git a/src/eu/cointelligence/controller/MarketMaker.java b/src/eu/cointelligence/controller/MarketMaker.java
index 69a8511..21fcbb1 100644
--- a/src/eu/cointelligence/controller/MarketMaker.java
+++ b/src/eu/cointelligence/controller/MarketMaker.java
@@ -24,12 +24,12 @@ public class MarketMaker implements IMarketMaker {
 	private StatementsDao statementsDao;
 	
 	
-	private Map<String, Long> statementsAndPrices;
+	private Map<Long, Long> statementsAndPrices;
 
     @PostConstruct
     public void init() {
         System.out.println("MarketMaker.initCache");
-        this.statementsAndPrices = new HashMap<String, Long>();
+        this.statementsAndPrices = new HashMap<Long, Long>();
 		List<Statement> statements = statementsDao.getStatements();
 		
 		for (Statement statement : statements) {
@@ -43,12 +43,12 @@ public void init() {
 
 	
 	@Override
-	public Map<String, Long> getStatementsAndPrices() {
+	public Map<Long, Long> getStatementsAndPrices() {
 		return this.statementsAndPrices;
 	}
 
 	@Override
-	public Long getPriceForStatement(String statementId) {
+	public Long getPriceForStatement(Long statementId) {
 		return this.statementsDao.find(statementId).getCurrentValue();
 	}
 
@@ -71,7 +71,7 @@ public void recomputePrices() {
 		statementsAndPrices = PricingAlgorithmFactory.getPricingAlgorithm().recalculate(statementsAndPrices, logs);
 		
 		//TODO: batch commit(see comment below)
-		for (String stId : this.statementsAndPrices.keySet()) {
+		for (Long stId : this.statementsAndPrices.keySet()) {
 			Statement st = this.statementsDao.find(stId);
 			st.setCurrentValue(this.statementsAndPrices.get(stId));
 			statementsDao.update(st);
diff --git a/src/eu/cointelligence/controller/PricingAlgorithmFactory.java b/src/eu/cointelligence/controller/PricingAlgorithmFactory.java
index 09b35fa..c13a61f 100644
--- a/src/eu/cointelligence/controller/PricingAlgorithmFactory.java
+++ b/src/eu/cointelligence/controller/PricingAlgorithmFactory.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Map;
 
-import eu.cointelligence.controller.entity.TradingAction;
+import eu.cointelligence.controller.entity.beans.TradingAction;
 import eu.cointelligence.model.Statement;
 import eu.cointelligence.model.Transaction;
 
@@ -16,8 +16,8 @@ public static IPricingAlgorithm getPricingAlgorithm() {
 		return new IPricingAlgorithm() {
  
 			@Override
-			public Map<String, Long> recalculate(
-					Map<String, Long> oldPrices, List<Transaction> logs) {
+			public Map<Long, Long> recalculate(
+					Map<Long, Long> oldPrices, List<Transaction> logs) {
 
 				Iterator<Transaction> iterator = logs.iterator();
 //				int last10Counter = logs.size() - 10;
diff --git a/src/eu/cointelligence/controller/StatementsService.java b/src/eu/cointelligence/controller/StatementsService.java
index 6ca558c..0cfba9d 100644
--- a/src/eu/cointelligence/controller/StatementsService.java
+++ b/src/eu/cointelligence/controller/StatementsService.java
@@ -1,7 +1,6 @@
 package eu.cointelligence.controller;
 
 import java.util.List;
-import java.util.UUID;
 
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
@@ -34,9 +33,7 @@ public List<Statement> getStatements(){
 	@Produces(MediaType.APPLICATION_JSON)
 	public boolean submitStatement(@FormParam("newStatement") Statement statement){
 		if(statement != null){
-			// set the ID 
-			statement.setId(UUID.randomUUID().toString());
-
+			
 			//if (user is not manager)
 			//set voteStarted to false
 			//current price to default
diff --git a/src/eu/cointelligence/controller/TraderService.java b/src/eu/cointelligence/controller/TraderService.java
index f858354..00b8572 100644
--- a/src/eu/cointelligence/controller/TraderService.java
+++ b/src/eu/cointelligence/controller/TraderService.java
@@ -11,7 +11,7 @@
 
 import eu.cointelligence.controller.dao.StatementsDao;
 import eu.cointelligence.controller.dao.UsersDao;
-import eu.cointelligence.controller.entity.TradingAction;
+import eu.cointelligence.controller.entity.beans.TradingAction;
 import eu.cointelligence.model.Account;
 import eu.cointelligence.model.Statement;
 import eu.cointelligence.model.Transaction;
@@ -46,7 +46,7 @@ public boolean buy(@FormParam("userId") String userId,
 		
 		Statement statement = statementsDao.find(statementId);
 		Long statementPrice = statement.getCurrentValue();
-		Account account = user.getAccount();
+		Account account = user.getAccount(); 
 		Long availableCash = account.getCointels();
 		if ((statementPrice == null || availableCash == null)
 				|| (availableCash <= statementPrice * wantedQuantity)) {
diff --git a/src/eu/cointelligence/controller/UsersService.java b/src/eu/cointelligence/controller/UsersService.java
index 2f0b6de..af2c6da 100644
--- a/src/eu/cointelligence/controller/UsersService.java
+++ b/src/eu/cointelligence/controller/UsersService.java
@@ -1,5 +1,7 @@
 package eu.cointelligence.controller;
 
+import java.util.List;
+
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.ws.rs.Consumes;
@@ -16,7 +18,7 @@
 
 import org.jboss.resteasy.spi.HttpResponse;
 
-import eu.cointelligence.controller.entity.RegisterForm;
+import eu.cointelligence.controller.entity.beans.RegisterForm;
 import eu.cointelligence.controller.users.IUserManager;
 import eu.cointelligence.controller.users.NoSuchUserException;
 import eu.cointelligence.controller.users.UserRole;
@@ -69,13 +71,14 @@ public Response register(@FormParam("regForm") RegisterForm regForm) {
 			newUser.setAge(regForm.getAge());
 			newUser.setGender(regForm.getGender());
 			newUser.setDepartment(regForm.getDepartment());
-			
+			newUser.setEmail(regForm.getEmail());
+			newUser.setPassword(null);//so it can update
+
 			userManager.updateUserInfo(newUser);
 		}catch(SecurityException | UserCreationException e){
 			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity("ooops").build();
 		}
 		
-		newUser.setPassword(null);
 		return Response.ok(newUser, MediaType.APPLICATION_JSON).build();
 	}
 	
@@ -84,4 +87,11 @@ public Response register(@FormParam("regForm") RegisterForm regForm) {
 	public boolean checkUser(@FormParam("username") String username) {
 		return this.userManager.isUser(username);
 	}
+	
+	@GET
+	@Path("/allUsers")
+	@Produces(MediaType.APPLICATION_JSON)
+	public List<User> getUsers(){
+		return this.userManager.getAllUsers();
+	}
 }
diff --git a/src/eu/cointelligence/controller/dao/AccountsDao.java b/src/eu/cointelligence/controller/dao/AccountsDao.java
new file mode 100644
index 0000000..0b724c2
--- /dev/null
+++ b/src/eu/cointelligence/controller/dao/AccountsDao.java
@@ -0,0 +1,14 @@
+package eu.cointelligence.controller.dao;
+
+import javax.ejb.Stateless;
+
+import eu.cointelligence.model.Account;
+
+@Stateless
+public class AccountsDao extends GenericDaoImpl<Account>{
+
+	public AccountsDao() {
+		super(Account.class);
+	}
+	
+}
diff --git a/src/eu/cointelligence/controller/dao/GenericDao.java b/src/eu/cointelligence/controller/dao/GenericDao.java
index 034664b..4391618 100644
--- a/src/eu/cointelligence/controller/dao/GenericDao.java
+++ b/src/eu/cointelligence/controller/dao/GenericDao.java
@@ -23,4 +23,6 @@ public interface GenericDao<T> {
     T update(T t);
 
 	List<T> getAll();   
+	
+	List<T> filter(String fieldName, Object value);
 }
\ No newline at end of file
diff --git a/src/eu/cointelligence/controller/dao/GenericDaoImpl.java b/src/eu/cointelligence/controller/dao/GenericDaoImpl.java
index 4e49add..bd566e7 100644
--- a/src/eu/cointelligence/controller/dao/GenericDaoImpl.java
+++ b/src/eu/cointelligence/controller/dao/GenericDaoImpl.java
@@ -6,8 +6,10 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
-
-import eu.cointelligence.model.Transaction;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 
 @Stateless
 public abstract class GenericDaoImpl<T> implements GenericDao<T> {
@@ -59,9 +61,26 @@ public T update(final T t) {
     
     @Override
     public List<T> getAll() {
-		Query q = em.createQuery("SELECT t from " + type.getName() + " as t LIMIT 0, 1000");
+		Query q = em.createQuery("SELECT t from " + type.getName() + " as t");
+		
 		
 		return (List<T>) q.getResultList();
 
     }
+    
+    @Override
+    public List<T> filter(String fieldName, Object value) {
+    	CriteriaBuilder cb = this.em.getCriteriaBuilder();
+    	CriteriaQuery criteriaQuery = cb.createQuery();
+    	Root<T> tRoot = criteriaQuery.from(this.type);
+    	
+    	criteriaQuery.select(tRoot);
+    	
+    	Predicate predicate = cb.equal(tRoot.get(fieldName), value);
+    	criteriaQuery.where(predicate);
+    	
+    	Query q  = this.em.createQuery(criteriaQuery);
+    	
+    	return q.getResultList();
+    }
 }
\ No newline at end of file
diff --git a/src/eu/cointelligence/controller/dao/UsersDao.java b/src/eu/cointelligence/controller/dao/UsersDao.java
index dab4464..580942b 100644
--- a/src/eu/cointelligence/controller/dao/UsersDao.java
+++ b/src/eu/cointelligence/controller/dao/UsersDao.java
@@ -7,6 +7,7 @@
 @Stateless
 public class UsersDao extends GenericDaoImpl<User> {
 
+
 	public UsersDao() {
 		super(User.class);
 	}
diff --git a/src/eu/cointelligence/controller/entity/Gender.java b/src/eu/cointelligence/controller/entity/Gender.java
deleted file mode 100644
index 7351d80..0000000
--- a/src/eu/cointelligence/controller/entity/Gender.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package eu.cointelligence.controller.entity;
-
-public enum Gender {
-	MALE,
-	FEMALE,
-	OTHER
-}
diff --git a/src/eu/cointelligence/controller/entity/beans/Gender.java b/src/eu/cointelligence/controller/entity/beans/Gender.java
new file mode 100644
index 0000000..2bb3d69
--- /dev/null
+++ b/src/eu/cointelligence/controller/entity/beans/Gender.java
@@ -0,0 +1,30 @@
+package eu.cointelligence.controller.entity.beans;
+
+public enum Gender {
+	MALE("MALE"),
+	FEMALE("FEMALE"),
+	OTHER("OTHER");
+	
+	private final String value;
+
+	Gender(String str) {
+		this.value = str;
+	}
+
+	public static Gender fromValue(String value) {
+		if (value != null) {
+			for (Gender role : values()) {
+				if (role.value.equals(value)) {
+					return role;
+				}
+			}
+		}
+
+		throw new IllegalArgumentException("Invalid Gender: " + value);
+	}
+
+	public String toValue() {
+		return value;
+	}
+
+}
diff --git a/src/eu/cointelligence/controller/entity/Order.java b/src/eu/cointelligence/controller/entity/beans/Order.java
similarity index 91%
rename from src/eu/cointelligence/controller/entity/Order.java
rename to src/eu/cointelligence/controller/entity/beans/Order.java
index 98cf0c0..787ccea 100644
--- a/src/eu/cointelligence/controller/entity/Order.java
+++ b/src/eu/cointelligence/controller/entity/beans/Order.java
@@ -1,4 +1,4 @@
-package eu.cointelligence.controller.entity;
+package eu.cointelligence.controller.entity.beans;
 
 public class Order {
 
diff --git a/src/eu/cointelligence/controller/entity/RegisterForm.java b/src/eu/cointelligence/controller/entity/beans/RegisterForm.java
similarity index 96%
rename from src/eu/cointelligence/controller/entity/RegisterForm.java
rename to src/eu/cointelligence/controller/entity/beans/RegisterForm.java
index 3a73edc..d5d369f 100644
--- a/src/eu/cointelligence/controller/entity/RegisterForm.java
+++ b/src/eu/cointelligence/controller/entity/beans/RegisterForm.java
@@ -1,4 +1,4 @@
-package eu.cointelligence.controller.entity;
+package eu.cointelligence.controller.entity.beans;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
diff --git a/src/eu/cointelligence/controller/entity/beans/StatementBean.java b/src/eu/cointelligence/controller/entity/beans/StatementBean.java
new file mode 100644
index 0000000..999af3f
--- /dev/null
+++ b/src/eu/cointelligence/controller/entity/beans/StatementBean.java
@@ -0,0 +1,36 @@
+package eu.cointelligence.controller.entity.beans;
+
+import java.io.Serializable;
+
+
+public class StatementBean implements Serializable{
+	private String title;
+	private String description;
+	private Boolean voteStarted;
+	private Long currentValue;
+	
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public Boolean getVoteStarted() {
+		return voteStarted;
+	}
+	public void setVoteStarted(Boolean voteStarted) {
+		this.voteStarted = voteStarted;
+	}
+	public Long getCurrentValue() {
+		return currentValue;
+	}
+	public void setCurrentValue(Long currentValue) {
+		this.currentValue = currentValue;
+	}
+}
diff --git a/src/eu/cointelligence/controller/entity/TradingAction.java b/src/eu/cointelligence/controller/entity/beans/TradingAction.java
similarity index 51%
rename from src/eu/cointelligence/controller/entity/TradingAction.java
rename to src/eu/cointelligence/controller/entity/beans/TradingAction.java
index 7414154..38ee650 100644
--- a/src/eu/cointelligence/controller/entity/TradingAction.java
+++ b/src/eu/cointelligence/controller/entity/beans/TradingAction.java
@@ -1,4 +1,4 @@
-package eu.cointelligence.controller.entity;
+package eu.cointelligence.controller.entity.beans;
 
 public enum TradingAction {
 		BUY, SELL, SHORTSELL;
diff --git a/src/eu/cointelligence/controller/log/AuditLog.java b/src/eu/cointelligence/controller/log/AuditLog.java
new file mode 100644
index 0000000..af8d803
--- /dev/null
+++ b/src/eu/cointelligence/controller/log/AuditLog.java
@@ -0,0 +1,89 @@
+package eu.cointelligence.controller.log;
+
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Date;
+import java.util.LinkedList;
+
+import javax.servlet.ServletContext;
+
+
+public class AuditLog {
+	
+	private ServletContext context;
+
+	public AuditLog(ServletContext context) {
+		this.context = context;
+	}
+	
+	public boolean log(String operation, String user, boolean status, String ip) {
+		return log(operation, user, status, ip, null);
+	}
+
+	public synchronized boolean log(String operation, String user, boolean status, String ip, String message) {
+		String auditLogPath = context.getRealPath("/WEB-INF/logs/audit.log");
+		System.out.println("auditlog " + auditLogPath);
+		FileWriter fileWriter = null;
+		File auditLog = new File(auditLogPath);
+		try {
+			if (!auditLog.exists()) {
+				auditLog.getParentFile().mkdirs();
+				auditLog.createNewFile();
+			}
+			fileWriter = new FileWriter(auditLogPath, true);
+			fileWriter.write("Operation " + operation + " for user " + user + " - " + (status?"SUCCESS":"FAILED") + " from ip " + ip +  " at " + new Date().toString() + (message != null?" reason" + message + " " : "") + "\n");
+			return true;
+		} catch (IOException e) {
+			e.printStackTrace();
+			return false;
+		} finally {
+			if (fileWriter != null) {
+				try {
+					fileWriter.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+	
+	public synchronized LinkedList<String[]> getAuditLogsForUser(String username) {
+		String auditLogPath = context.getRealPath("/WEB-INF/logs/audit.log");
+		BufferedReader bufferedReader = null;
+		FileReader fileReader = null;
+		try {
+			fileReader = new FileReader(auditLogPath);
+			bufferedReader = new BufferedReader(fileReader);
+			String line = bufferedReader.readLine();
+			LinkedList<String[]> list = new LinkedList<String[]>();
+			while (line != null) {
+				String[] l = line.split(" ");
+				if (l[4].trim().equals(username)) {
+					String result[] = new String[] {
+							l[1], l[4], l[6], l[9]
+					};
+					
+					list.add(result);
+				}
+				line = bufferedReader.readLine();
+			}
+			return list;
+		} catch (IOException e) {
+			e.printStackTrace();
+			return null;
+		} finally {
+			if (bufferedReader != null) {
+				try {
+					bufferedReader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+	
+}
diff --git a/src/eu/cointelligence/controller/servlet/UserLoginServlet.java b/src/eu/cointelligence/controller/servlet/UserLoginServlet.java
index 660572e..add2de0 100644
--- a/src/eu/cointelligence/controller/servlet/UserLoginServlet.java
+++ b/src/eu/cointelligence/controller/servlet/UserLoginServlet.java
@@ -17,6 +17,8 @@
 import eu.cointelligence.controller.users.IUserManager;
 import eu.cointelligence.controller.users.UserManagerImpl;
 import eu.cointelligence.controller.users.UserRole;
+import eu.cointelligence.controller.users.exceptions.UserCreationException;
+import eu.cointelligence.controller.users.exceptions.UserExistsException;
 import eu.cointelligence.model.User;
 
 /**
@@ -34,7 +36,23 @@ public class UserLoginServlet extends HttpServlet {
     public UserLoginServlet() {
         super();
     }
-
+    
+    @Override
+    public void init() throws ServletException {
+    	super.init();
+    	if(userManager.getAllUsers().size() == 0) {
+    		try {
+    			System.out.println("Created ADMIN account with user/pass: " + "admin / kokikoki");
+				userManager.createNewUser("admin", "kokikoki");
+			} catch (UserExistsException e) {
+				System.out.println("This could never happen");
+				e.printStackTrace();
+			} catch (UserCreationException e) {
+				System.out.println("that's bad - there is no admin account - create one from the database");
+				e.printStackTrace();
+			}
+    	}
+    }
 	/**
 	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
 	 */
diff --git a/src/eu/cointelligence/controller/users/IUserManager.java b/src/eu/cointelligence/controller/users/IUserManager.java
index d56a933..f30cef6 100644
--- a/src/eu/cointelligence/controller/users/IUserManager.java
+++ b/src/eu/cointelligence/controller/users/IUserManager.java
@@ -1,5 +1,7 @@
 package eu.cointelligence.controller.users;
 
+import java.util.List;
+
 import javax.resource.spi.SecurityException;
 
 import eu.cointelligence.controller.users.exceptions.UserCreationException;
@@ -119,4 +121,6 @@ public interface IUserManager {
 
 	User loginWithCookie(String username, byte[] passwordHash,
 			UserRole loginType) throws WrongPasswordException, SecurityException, NoSuchUserException;
+
+	List<User> getAllUsers();
 }
diff --git a/src/eu/cointelligence/controller/users/UserManagerImpl.java b/src/eu/cointelligence/controller/users/UserManagerImpl.java
index 0277fdf..d909fdb 100644
--- a/src/eu/cointelligence/controller/users/UserManagerImpl.java
+++ b/src/eu/cointelligence/controller/users/UserManagerImpl.java
@@ -4,23 +4,30 @@
 import java.security.InvalidParameterException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.List;
 
+import javax.ejb.EJB;
 import javax.ejb.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import javax.resource.spi.SecurityException;
 
+import eu.cointelligence.controller.Constants;
+import eu.cointelligence.controller.dao.AccountsDao;
+import eu.cointelligence.controller.dao.UsersDao;
 import eu.cointelligence.controller.users.exceptions.UserCreationException;
 import eu.cointelligence.controller.users.exceptions.UserExistsException;
 import eu.cointelligence.controller.users.exceptions.WrongPasswordException;
+import eu.cointelligence.model.Account;
 import eu.cointelligence.model.User;
 
 @Singleton
 public class UserManagerImpl implements IUserManager {
 
-	@PersistenceContext
-	private EntityManager entityManager;
-
+	@EJB
+	private UsersDao usersDao;
+	@EJB
+	private AccountsDao accountsDao;
+	
 	@Override
 	public void removeUser(String username, String comment) {
 		// TODO Auto-generated method stub
@@ -36,10 +43,11 @@ public User login(String username, String password, UserRole loginType)
 
 		final String userSearch = username.toLowerCase();
 
-		User user = this.entityManager.find(User.class, userSearch);
+		User user = this.usersDao.find(userSearch);
 		if(user == null) {
 			throw new NoSuchUserException();
 		}
+		
 		UserRole role = user.getRole();
 		if (role == null || !role.equals(loginType)) {
 			throw new SecurityException();
@@ -63,7 +71,7 @@ public User loginWithCookie(String username, byte[] passwordHash,
 
 		final String userSearch = username.toLowerCase();
 
-		User user = this.entityManager.find(User.class, userSearch);
+		User user = this.usersDao.find(userSearch);
 		if(user == null){
 			throw new NoSuchUserException();
 		}
@@ -87,7 +95,7 @@ public User createNewUser(String username, String password)
 
 		final String userSearch = username.toLowerCase();
 
-		User user = this.entityManager.find(User.class, userSearch);
+		User user = this.usersDao.find(userSearch);
 		try {
 			if (user != null) {
 				System.out.println("found the user " + user.getUserName());
@@ -117,11 +125,17 @@ public User createNewUser(String username, String password)
 				user.setRole(UserRole.USER);
 				// user.removed = Boolean.valueOf(false);
 				// user.confirmed = Boolean.valueOf(true);
+				Account newAccount = accountsDao.create(new Account());
+				
+				newAccount.setCointels(Constants.DEFAULT_COINTELS);
+				newAccount.setStatementsInPossession(new HashMap<Long, Long>());
+				
+				user.setAccount(newAccount);
 				System.out.println("creating user " + user.getUserName()
 						+ " with pass " + user.getPassword());
 			}
 
-			this.entityManager.merge(user);
+			this.usersDao.update(user);
 			return user;
 		} catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
 			e.printStackTrace();
@@ -150,7 +164,7 @@ public boolean isAdmin(String username) {
 
 		final String userSearch = username.toLowerCase();
 
-		User user = this.entityManager.find(User.class, userSearch);
+		User user = this.usersDao.find(userSearch);
 
 		return user.getRole().equals(UserRole.ADMIN);
 	}
@@ -163,7 +177,7 @@ public boolean isManager(String username) {
 
 		final String userSearch = username.toLowerCase();
 
-		User user = this.entityManager.find(User.class, userSearch);
+		User user = this.usersDao.find(userSearch);
 
 		return user.getRole().equals(UserRole.MANAGER);
 	}
@@ -176,7 +190,7 @@ public boolean isUser(String username) {
 
 		final String userSearch = username.toLowerCase();
 
-		User user = this.entityManager.find(User.class, userSearch);
+		User user = this.usersDao.find(userSearch);
 
 		return user.getRole().equals(UserRole.USER);
 	}
@@ -189,7 +203,7 @@ public User getUser(String username, String password) {
 
 		final String userSearch = username.toLowerCase();
 
-		return this.entityManager.find(User.class, userSearch);
+		return this.usersDao.find(userSearch);
 
 	}
 
@@ -198,8 +212,17 @@ public User updateUserInfo(User user) {
 		// do not update the password from here
 		if (user.getPassword() != null)
 			return null;
-
-		this.entityManager.merge(user);
+		
+		User result = this.usersDao.find(user.getUserName());
+		User merged = this.usersDao.update(result);
+				
+		merged.setAge(user.getAge());
+		merged.setDepartment(user.getDepartment());
+		merged.setEmail(user.getEmail());
+		merged.setFullName(user.getFullName());
+		merged.setGender(user.getGender());
+		merged.setRole(user.getRole());
+		
 		return user;
 	}
 
@@ -221,4 +244,9 @@ private String getMD5Hash(String password) throws NoSuchAlgorithmException,
 		return hexString.toString();
 	}
 
+	@Override
+	public List<User> getAllUsers() {
+		return this.usersDao.getAll();
+	}
+
 }
diff --git a/src/eu/cointelligence/controller/users/UserRole.java b/src/eu/cointelligence/controller/users/UserRole.java
index 47e6342..2887cf0 100644
--- a/src/eu/cointelligence/controller/users/UserRole.java
+++ b/src/eu/cointelligence/controller/users/UserRole.java
@@ -1,29 +1,28 @@
 package eu.cointelligence.controller.users;
 
 public enum UserRole {
-	USER(0), MANAGER(1), ADMIN(2);
+	USER("USER"), MANAGER("MANAGER"), ADMIN("ADMIN");
 
-	private int value;
+	private final String value;
 
-	UserRole(int value) {
-		this.value = value;
+	UserRole(String str) {
+		this.value = str;
 	}
 
-	// the identifierMethod
-	public int toInt() {
-		return value;
+	public static UserRole fromValue(String value) {
+		if (value != null) {
+			for (UserRole role : values()) {
+				if (role.value.equals(value)) {
+					return role;
+				}
+			}
+		}
+
+		throw new IllegalArgumentException("Invalid UserRole: " + value);
 	}
 
-	public static UserRole fromInt(int value) {
-		switch (value) {
-		case 0:
-			return USER;
-		case 1:
-			return MANAGER;
-		case 2:
-			return ADMIN;
-		default:
-			return USER;
-		}
+	public String toValue() {
+		return value;
 	}
+
 }
diff --git a/src/eu/cointelligence/listeners/ApplicationStartedListener.java b/src/eu/cointelligence/listeners/ApplicationStartedListener.java
new file mode 100644
index 0000000..e2bef48
--- /dev/null
+++ b/src/eu/cointelligence/listeners/ApplicationStartedListener.java
@@ -0,0 +1,30 @@
+package eu.cointelligence.listeners;
+
+import javax.ejb.EJB;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+import eu.cointelligence.controller.log.AuditLog;
+import eu.cointelligence.controller.users.IUserManager;
+
+@WebListener
+public final class ApplicationStartedListener implements ServletContextListener {
+
+	private ServletContext context = null;
+	@EJB
+	private IUserManager users;
+	
+	public void contextInitialized(ServletContextEvent event) {
+		context = event.getServletContext();
+		AuditLog auditLog = new AuditLog(context);
+		context.setAttribute("auditLog", auditLog);
+		System.out.println("application started...");
+	}
+
+	public void contextDestroyed(ServletContextEvent event) {		
+		context.removeAttribute("auditLog");
+		System.out.println("application stopping...");
+	}
+}
diff --git a/src/eu/cointelligence/model/Account.java b/src/eu/cointelligence/model/Account.java
index cbeffa0..3966233 100644
--- a/src/eu/cointelligence/model/Account.java
+++ b/src/eu/cointelligence/model/Account.java
@@ -6,6 +6,8 @@
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
@@ -16,9 +18,10 @@ public class Account {
 	@Basic
 	private Long cointels;
 	@ElementCollection(fetch = FetchType.EAGER)
-	private Map<String, Long> statementsInPossession;
+	private Map<Long, Long> statementsInPossession;
 	@Id
-	private String id;
+	@GeneratedValue(strategy=GenerationType.IDENTITY)
+	private Long id;
 
 	public void setCointels(Long param) {
 		this.cointels = param;
@@ -28,19 +31,19 @@ public Long getCointels() {
 		return cointels;
 	}
 
-	public void setStatementsInPossession(Map<String, Long> param) {
+	public void setStatementsInPossession(Map<Long, Long> param) {
 		this.statementsInPossession = param;
 	}
-
-	public Map<String, Long> getStatementsInPossession() {
+ 
+	public Map<Long, Long> getStatementsInPossession() {
 		return statementsInPossession;
 	}
 
-	public void setId(String param) {
+	public void setId(Long param) {
 		this.id = param;
 	}
 
-	public String getId() {
+	public Long getId() {
 		return id;
 	}
 
diff --git a/src/eu/cointelligence/model/Account_.java b/src/eu/cointelligence/model/Account_.java
index 18a6737..8e18d84 100644
--- a/src/eu/cointelligence/model/Account_.java
+++ b/src/eu/cointelligence/model/Account_.java
@@ -5,10 +5,10 @@
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2013-05-14T05:11:22.802+0300")
+@Generated(value="Dali", date="2013-05-28T20:53:25.128+0300")
 @StaticMetamodel(Account.class)
 public class Account_ {
 	public static volatile SingularAttribute<Account, Long> cointels;
-	public static volatile MapAttribute<Account, String, Long> statementsInPossession;
-	public static volatile SingularAttribute<Account, String> id;
+	public static volatile MapAttribute<Account, Long, Long> statementsInPossession;
+	public static volatile SingularAttribute<Account, Long> id;
 }
diff --git a/src/eu/cointelligence/model/Statement.java b/src/eu/cointelligence/model/Statement.java
index aca6d07..bce3751 100644
--- a/src/eu/cointelligence/model/Statement.java
+++ b/src/eu/cointelligence/model/Statement.java
@@ -2,12 +2,16 @@
 
 import javax.persistence.Basic;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
 
+import eu.cointelligence.controller.users.UserRole;
+
 @Entity
 @Table(name = "T_STATEMENT")
 public class Statement {
@@ -18,11 +22,14 @@ public class Statement {
 	@Basic
 	private String description;
 	@Basic
+	private String ownersGroup;
+	@Basic
 	private Boolean voteStarted;
 	@Basic
 	private Long currentValue;
 	@Id
-	private String id;
+	@GeneratedValue(strategy=GenerationType.IDENTITY)
+	private Long id;
 
 	public void setTitle(String param) {
 		this.title = param;
@@ -67,11 +74,19 @@ public static Statement valueOf(String s) {
 		return statement;
 	}
 
-	public void setId(String param) {
+	public void setId(Long param) {
 		this.id = param;
 	}
 
-	public String getId() {
+	public Long getId() {
 		return id;
 	}
-}
\ No newline at end of file
+	
+	public UserRole getOwnersGroup() {
+		return UserRole.valueOf(ownersGroup);
+	}
+	
+	public void setOwnersGroup(UserRole ownersGroup) {
+		this.ownersGroup = ownersGroup.toString();
+	}
+}
diff --git a/src/eu/cointelligence/model/Statement_.java b/src/eu/cointelligence/model/Statement_.java
index 09cbefc..1b49e88 100644
--- a/src/eu/cointelligence/model/Statement_.java
+++ b/src/eu/cointelligence/model/Statement_.java
@@ -4,12 +4,13 @@
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2013-05-14T05:07:40.951+0300")
+@Generated(value="Dali", date="2013-05-28T20:53:25.314+0300")
 @StaticMetamodel(Statement.class)
 public class Statement_ {
 	public static volatile SingularAttribute<Statement, String> title;
 	public static volatile SingularAttribute<Statement, String> description;
+	public static volatile SingularAttribute<Statement, String> ownersGroup;
 	public static volatile SingularAttribute<Statement, Boolean> voteStarted;
 	public static volatile SingularAttribute<Statement, Long> currentValue;
-	public static volatile SingularAttribute<Statement, String> id;
+	public static volatile SingularAttribute<Statement, Long> id;
 }
diff --git a/src/eu/cointelligence/model/User.java b/src/eu/cointelligence/model/User.java
index 0283e4b..9ad93ea 100644
--- a/src/eu/cointelligence/model/User.java
+++ b/src/eu/cointelligence/model/User.java
@@ -5,8 +5,9 @@
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
-import eu.cointelligence.controller.entity.Gender;
+import eu.cointelligence.controller.entity.beans.Gender;
 import eu.cointelligence.controller.users.UserRole;
 
 @Entity
@@ -22,17 +23,17 @@ public class User {
 	private String passwordHash;
 	@Basic
 	private String email;
-
 	@Basic
-	private String password; //the cookie
+	private String password;
 	@Basic
-	private UserRole role;
+	private String roleString;
 	@Basic
 	private int age;
 	@Basic
-	private Gender gender;
+	private String genderString;
 	@Basic 
 	private String department;
+		
 	public int getAge() {
 		return age;
 	}
@@ -42,11 +43,11 @@ public void setAge(int age) {
 	}
 
 	public Gender getGender() {
-		return gender;
+		return Gender.valueOf(this.genderString);
 	}
 
 	public void setGender(Gender gender) {
-		this.gender = gender;
+		this.genderString = gender.toString();
 	}
 
 	public String getDepartment() {
@@ -93,11 +94,11 @@ public void setPassword(String password) {
 	}
 
 	public void setRole(UserRole param) {
-		this.role = param;
+		this.roleString = param.toString();				
 	}
 
 	public UserRole getRole() {
-		return role;
+		return UserRole.valueOf(roleString);
 	}
 
 	public Account getAccount() {
diff --git a/src/eu/cointelligence/model/User_.java b/src/eu/cointelligence/model/User_.java
index becc2e9..f4d0252 100644
--- a/src/eu/cointelligence/model/User_.java
+++ b/src/eu/cointelligence/model/User_.java
@@ -1,22 +1,20 @@
 package eu.cointelligence.model;
 
-import eu.cointelligence.controller.entity.Gender;
-import eu.cointelligence.controller.users.UserRole;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2013-05-25T17:04:30.185+0300")
+@Generated(value="Dali", date="2013-05-28T20:53:25.443+0300")
 @StaticMetamodel(User.class)
 public class User_ {
 	public static volatile SingularAttribute<User, String> fullName;
 	public static volatile SingularAttribute<User, String> userName;
 	public static volatile SingularAttribute<User, String> passwordHash;
-	public static volatile SingularAttribute<User, UserRole> role;
+	public static volatile SingularAttribute<User, String> email;
+	public static volatile SingularAttribute<User, String> password;
+	public static volatile SingularAttribute<User, String> roleString;
 	public static volatile SingularAttribute<User, Integer> age;
-	public static volatile SingularAttribute<User, Gender> gender;
+	public static volatile SingularAttribute<User, String> genderString;
 	public static volatile SingularAttribute<User, String> department;
 	public static volatile SingularAttribute<User, Account> account;
-	public static volatile SingularAttribute<User, String> password;
-	public static volatile SingularAttribute<User, String> email;
 }
diff --git a/test/eu/cointelligence/controller/UsersServiceTest.java b/test/eu/cointelligence/controller/UsersServiceTest.java
index c49835f..6b67bc4 100644
--- a/test/eu/cointelligence/controller/UsersServiceTest.java
+++ b/test/eu/cointelligence/controller/UsersServiceTest.java
@@ -5,8 +5,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import eu.cointelligence.controller.entity.Gender;
-import eu.cointelligence.controller.entity.RegisterForm;
+import eu.cointelligence.controller.entity.beans.Gender;
+import eu.cointelligence.controller.entity.beans.RegisterForm;
 
 public class UsersServiceTest {