diff --git a/Darius_T_Moomivand_Code/README.md b/Darius_T_Moomivand_Code/README.md
new file mode 100644
index 000000000..9a6ff3f7f
--- /dev/null
+++ b/Darius_T_Moomivand_Code/README.md
@@ -0,0 +1 @@
+Darius_T_Moomivand's code
diff --git a/Project1/ersV2/WEB-INF/web.xml b/Project1/ersV2/WEB-INF/web.xml
new file mode 100755
index 000000000..76fd9251b
--- /dev/null
+++ b/Project1/ersV2/WEB-INF/web.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+	version="3.1">
+	<display-name>ers</display-name>
+
+	<servlet>
+		<servlet-name>FrontController</servlet-name>
+		<servlet-class>com.revature.servlets.LoadViewsServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>FrontController</servlet-name>
+		<url-pattern>*.view</url-pattern>
+	</servlet-mapping>
+
+</web-app>
\ No newline at end of file
diff --git a/Project1/ersV2/pom.xml b/Project1/ersV2/pom.xml
new file mode 100755
index 000000000..b51b3336e
--- /dev/null
+++ b/Project1/ersV2/pom.xml
@@ -0,0 +1,53 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.revature</groupId>
+	<artifactId>ers</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<name>proj1</name>
+
+	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.oracle</groupId>
+			<artifactId>ojdbc7</artifactId>
+			<version>11.2.0</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.9.0.pr4</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.9.0.pr4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<finalName>ers</finalName>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/Project1/ersV2/src/main/java/com/revature/dao/Dao.java b/Project1/ersV2/src/main/java/com/revature/dao/Dao.java
new file mode 100755
index 000000000..c166bb396
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/dao/Dao.java
@@ -0,0 +1,25 @@
+package com.revature.dao;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.revature.pojos.User;
+
+public interface Dao<T, I extends Serializable> {
+	
+	List<T> getAll();
+	List<T> getAllOfUser(I id);
+	T findPw(T obj);
+	T findOne(I id);
+	T findOne(T obj);
+	T insert(T obj);
+	T save(T obj);
+	T update(T obj);
+	void delete(T obj);
+	default boolean isUnique(T obj) {
+		return true;
+	}
+	User findOne(String s);
+
+	
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/dao/DaoUser.java b/Project1/ersV2/src/main/java/com/revature/dao/DaoUser.java
new file mode 100755
index 000000000..dab9848ad
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/dao/DaoUser.java
@@ -0,0 +1,181 @@
+package com.revature.dao;
+
+import com.revature.dao.Dao;
+import com.revature.pojos.User;
+import com.revature.util.ConnectionFactory;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.List;
+
+public class DaoUser implements Dao<User, Integer> {
+
+	public static void main(String[] args) {
+		DaoUser usr = new DaoUser();
+		
+		List<User> users = usr.getAll();
+		for(User x : users) {
+			System.out.println(x);
+		}
+		
+	}
+	
+	@Override
+	public List<User> getAll() {
+		List<User> users = new ArrayList<User>();
+		try(Connection conn = ConnectionFactory.getInstance().getConnection();){
+			String query = "select * from ers_users";
+			
+			Statement statement = conn.createStatement();
+			ResultSet rs = statement.executeQuery(query);
+			
+			while(rs.next()) {
+				//ERS_USERS_ID, ERS_USERNAME, ERS_PASSWORD, USER_FIRST_NAME, USER_LAST_NAME, USER_EMAIL, USER_ROLE_ID
+				User temp = new User();
+				temp.setUserId(rs.getInt(1));
+				temp.setUserName(rs.getString(2));
+				temp.setPassword(rs.getString(3));
+				temp.setFirstName(rs.getString(4));
+				temp.setLastName(rs.getString(5));
+				temp.setEmail(rs.getString(6));
+				temp.setRoleId(rs.getInt(7));
+				users.add(temp);
+				
+			}
+			
+		} catch(SQLException e) {
+			e.printStackTrace();
+		}
+		
+		return users;
+	}
+
+	
+
+
+	@Override
+	public User save(User obj) {
+		try(Connection conn = ConnectionFactory.getInstance().getConnection();){
+			conn.setAutoCommit(false);
+			String query = "Insert into ers_users(ers_username, ers_password, user_first_name "
+					+ "user_last_name, user_email, user_role_id) values(?,?,?,?,?,?)";
+			String[] keys = new String[1];
+			keys[0] = "ers_user_id";
+			
+			PreparedStatement ps = conn.prepareStatement(query, keys);
+			ps.setString(1,  obj.getUserName());
+			ps.setString(2, obj.getPassword());
+			ps.setString(3,  obj.getFirstName());
+			ps.setString(4, obj.getLastName());
+			ps.setString(5, obj.getEmail());
+			ps.setInt(6, obj.getRoleId());
+			
+			int rows = ps.executeUpdate();
+			
+			if(rows != 0) {
+				ResultSet pk = ps.getGeneratedKeys();
+				while(pk.next()) {
+					obj.setUserId(pk.getInt(1));
+				}
+				
+				conn.commit();
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+		
+		return obj;
+	}
+
+	@Override
+	public User update(User obj) {
+//		try(Connection conn = ConnectionFactory.getInstance().getConnection();){
+//			conn.setAutoCommit(false);
+//			
+//			String query = "update ers_users set"
+//			
+//			
+//			
+		return null;
+	}
+
+	@Override
+	public boolean isUnique(User obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public User findPw(User obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	
+	public User findOne(String usr) {
+		User temp = new User();
+		
+		try(Connection conn = ConnectionFactory.getInstance().getConnection()){
+			String sql = "select * from ers_users where id= ?";
+			PreparedStatement ps = conn.prepareStatement(sql);
+			ps.setString(1, usr);
+			ResultSet info= ps.executeQuery();
+			
+			while(info.next()) {
+				temp.setUserId(info.getInt(1));
+				temp.setUserName(info.getString(2));
+				temp.setPassword(info.getString(3));
+				temp.setFirstName(info.getString(4));
+				temp.setLastName(info.getString(5));
+				temp.setEmail(info.getString(6));
+				temp.setRoleId(info.getInt(7));
+			}
+		} catch(SQLException e) {
+				e.printStackTrace();
+			
+		}
+		return temp;
+	}
+
+	@Override
+	public User insert(User obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void delete(User obj) {
+		// TODO Auto-generated method stub
+		
+	}
+
+
+
+
+	@Override
+	public User findOne(Integer id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+
+
+	@Override
+	public User findOne(User obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<User> getAllOfUser(Integer id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/dao/TicketDao.java b/Project1/ersV2/src/main/java/com/revature/dao/TicketDao.java
new file mode 100755
index 000000000..d385d2962
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/dao/TicketDao.java
@@ -0,0 +1,293 @@
+package com.revature.dao;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLSyntaxErrorException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.revature.helpers.HelperFunctions;
+import com.revature.pojos.Tickets;
+import com.revature.pojos.User;
+import com.revature.util.ConnectionFactory;
+
+public class TicketDao extends HelperFunctions implements Dao<Tickets, Integer> {
+
+	@Override
+	public List<Tickets> getAllOfUser(Integer userId) {
+		
+		List<Tickets> ticketsList = new ArrayList<Tickets>();
+		try(Connection conn = ConnectionFactory.getInstance().getConnection()) {
+			
+//			String select_query = "select * from ers_reimbursement";
+			
+			String select_query = "SELECT ers_users.user_first_name, ers_users.user_last_name , ers_reimbursement.reimb_amount, ers_reimbursement.reimb_submitted, " + 
+					"ers_reimbursement.reimb_resolved, ers_reimbursement.reimb_description, ers_reimbursement_status.reimb_status " + 
+					"FROM ((ers_users " + 
+					"INNER JOIN ers_reimbursement ON ers_users.ers_users_id = ers_reimbursement.reimb_author) " + 
+					"INNER JOIN ers_reimbursement_status ON ers_reimbursement.reimb_status_id = ers_reimbursement_status.reimb_status_id) " + 
+					"WHERE ers_users.ers_users_id = " + userId.toString() + " " +
+					"order by reimb_id desc";
+			
+			ResultSet selectRS = conn.createStatement().executeQuery(select_query);
+			
+			while(selectRS.next()) {
+				Tickets tickets = new Tickets(selectRS.getString(1),
+											  selectRS.getString(2),
+											  selectRS.getDouble(3),
+											  selectRS.getString(4),
+											  selectRS.getString(5),
+											  selectRS.getString(6),
+											  selectRS.getString(7)
+											  );
+				ticketsList.add(tickets);
+				System.out.println(tickets);
+						
+			}							  
+		} catch(SQLException e) {
+				e.printStackTrace();
+		}
+			
+		return ticketsList;
+		
+	}
+	
+	@Override
+	public List<Tickets> getAll() {
+		
+		List<Tickets> ticketsList = new ArrayList<Tickets>();
+		try(Connection conn = ConnectionFactory.getInstance().getConnection()) {
+			
+//			String select_query = "select * from ers_reimbursement";
+			
+			String select_query = "SELECT ers_users.ers_users_id, ers_reimbursement.reimb_id, ers_reimbursement_status.reimb_status_id, ers_users.user_first_name, ers_users.user_last_name , ers_reimbursement.reimb_amount, ers_reimbursement.reimb_submitted, " + 
+					"ers_reimbursement.reimb_resolved, ers_reimbursement.reimb_description, ers_reimbursement_status.reimb_status " + 
+					"FROM ((ers_users " + 
+					"INNER JOIN ers_reimbursement ON ers_users.ers_users_id = ers_reimbursement.reimb_author) " + 
+					"INNER JOIN ers_reimbursement_status ON ers_reimbursement.reimb_status_id = ers_reimbursement_status.reimb_status_id) " + 
+					//"WHERE ers_users.ers_users_id = 1 " +
+					"order by reimb_id desc";
+			
+			ResultSet selectRS = conn.createStatement().executeQuery(select_query);
+			
+			while(selectRS.next()) {
+				
+				Tickets tickets = new Tickets(
+												  selectRS.getInt(1), //userid
+												  selectRS.getInt(2), //reimb_id
+												  selectRS.getInt(3), //reimb_status_id
+												  selectRS.getString(4),
+												  selectRS.getString(5),
+												  selectRS.getDouble(6),
+												  selectRS.getString(7),
+												  selectRS.getString(8),
+												  selectRS.getString(9),
+												  selectRS.getString(10)
+						  						);
+				
+//				Tickets tickets = new Tickets(selectRS.getString(1),
+//											  selectRS.getString(2),
+//											  selectRS.getDouble(3),
+//											  selectRS.getString(4),
+//											  selectRS.getString(5),
+//											  selectRS.getString(6),
+//											  selectRS.getString(7)
+//											  );
+				ticketsList.add(tickets);
+				System.out.println(tickets);
+						
+			}							  
+		} catch(SQLException e) {
+				e.printStackTrace();
+		}
+			
+		return ticketsList;
+	}
+
+	@Override
+	public Tickets findOne(Integer id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Tickets save(Tickets obj) {
+		
+		System.out.println("im finally in the Ticket Save Dao++++++");
+		
+		try (Connection conn = ConnectionFactory.getInstance().getConnection()) {
+			
+			conn.setAutoCommit(false);
+			/*String query = "insert into ers_reimbursement " +
+					"(REIMB_AMOUNT, REIMB_SUBMITTED, REIMB_RESOLVED, REIMB_DESCRIPTION, REIMB_RECEIPT, REIMB_AUTHOR, REIMB_RESOLVER, REIMB_STATUS_ID, REIMB_TYPE_ID)" +
+					"values " +
+					"( ?, ?, ?, ?, ?, ?, ?, ?, ? )";*/
+			
+			String query = "insert into ers_reimbursement " +
+					"(REIMB_AMOUNT, REIMB_RESOLVED, REIMB_DESCRIPTION, REIMB_RECEIPT, REIMB_AUTHOR, REIMB_RESOLVER, REIMB_STATUS_ID, REIMB_TYPE_ID)" +
+					"values " +
+					"( ?, ?, ?, ?, ?, ?, ?, ? )";
+	
+			String[] autogen_keys = {"reimb_id"};
+			PreparedStatement ps = conn.prepareStatement(query, autogen_keys);
+
+			
+			// REIMB_AMOUNT
+			ps.setDouble(1, obj.getCash());
+//			ps.setString(2, obj.getSubmit());	// timestamp need to tell db to TimeStamp
+			
+			// REIMB_RESOLVED
+			ps.setTimestamp(2, null);	// timestamp should be null
+			
+			// REIMB_DESCRIPTION
+			ps.setString(3, obj.getDescription());
+			
+			// REIMB_RECEIPT
+			ps.setString(4, null);		// want to set to null
+			
+			// REIMB_AUTHOR
+			ps.setInt(5, obj.getUserId());
+			
+			// REIMB_RESOLVER
+			ps.setString(6, null);			// want to set to null (person who resolves)	
+			
+			// REIMB_STATUS_ID
+			ps.setInt(7, 1);
+			
+			// REIMB_TYPE_ID
+			ps.setInt(8, obj.getType());
+			
+			int rowsInserted = ps.executeUpdate();
+
+			System.out.println("rowsInserted -> " + rowsInserted);
+			System.out.println(obj.toString());
+			
+			if (rowsInserted > 0) {
+				
+				System.out.println("Inserted rows: " + rowsInserted);
+				
+				// Get id genereated from db and add it (set it) to object id.
+				ResultSet rsGenKeys = ps.getGeneratedKeys();
+				
+//				while (rsGenKeys.next()) {
+//					
+//					print("=====>");
+//					print(rsGenKeys.getObject(1));
+//					print(rsGenKeys.getInt(1));
+//					
+//					print(rsGenKeys.toString());
+//					obj.setUserId(rsGenKeys.getInt(1));
+//					
+//				}
+				
+				conn.commit();
+				
+			}
+			
+		} 
+//		catch (SQLSyntaxErrorException ssee) {
+////			ssee.printStackTrace();
+//			print("\n--- Something occured -> ");
+//			
+//			if (ssee.getMessage().contains("Could not commit with auto-commit set on")) {
+//				print("\t" + ssee.getMessage() + "    Data was added, but there was a problem, though...");
+//			} else {
+//				print("\t" + ssee.getMessage() + "    DATA WAS NOT ADDED\n");
+//			}
+//		}
+//			catch (SQLException se) {
+////			e.printStackTrace();ssee.printStackTrace();
+//			print("\n--- Something occured -> ");
+//			print("\t" + se.getMessage() + "    DATA WAS NOT ADDED\n");
+//		}
+		catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		System.out.println("here ");
+		
+		return obj;
+			
+	}
+
+	@Override
+	public Tickets update(Tickets obj) {
+	
+		System.out.println("We are in the update dao");
+		System.out.println(obj.toString());
+		
+		////////////////////////////////////////////////
+
+		try (Connection conn = ConnectionFactory.getInstance().getConnection()) {
+			
+			PreparedStatement preparedStatement = null;
+
+			String updateSql = "update ers_reimbursement " + 
+							   "set reimb_resolved = CURRENT_TIMESTAMP, " + 
+							   "    reimb_resolver = ?, " + 
+							   "    reimb_status_id = ? " + 
+							   "where reimb_id = ?";
+
+			preparedStatement = conn.prepareStatement(updateSql);
+
+			preparedStatement.setInt(1, obj.getUserId());
+			preparedStatement.setInt(2, obj.getStatusId());
+			preparedStatement.setInt(3, obj.getTicketId());
+
+			// execute update SQL stetement
+			preparedStatement.executeUpdate();
+
+			System.out.println("Record is updated to ers_reimbursement table!");
+			
+			
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		////////////////////////////////////////////////
+		
+		
+		return obj;
+	}
+
+	@Override
+	public boolean isUnique(Tickets obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public Tickets findPw(Tickets obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Tickets findOne(Tickets obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Tickets insert(Tickets obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void delete(Tickets obj) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public User findOne(String s) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/helpers/HelperFunctions.java b/Project1/ersV2/src/main/java/com/revature/helpers/HelperFunctions.java
new file mode 100755
index 000000000..d358da295
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/helpers/HelperFunctions.java
@@ -0,0 +1,7 @@
+package com.revature.helpers;
+
+public class HelperFunctions {
+	public static void print(Object object) {
+		System.out.println(object);
+	}
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/pojos/Tickets.java b/Project1/ersV2/src/main/java/com/revature/pojos/Tickets.java
new file mode 100755
index 000000000..65e3c6c57
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/pojos/Tickets.java
@@ -0,0 +1,289 @@
+package com.revature.pojos;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class Tickets {
+	private String firstName;
+	private String lastName;
+	private double cash;
+	private String submit;
+	private String resolved;
+	private String description;
+	private String status;
+	private int type;
+	private int userId;
+	private int ticketId;
+	private int statusId;
+	private int roleId;
+	private String email;
+	private String userName;
+	private String password;
+	
+	public Tickets() {}
+	
+	public Tickets(double cash, String description, int type, int userId) {
+		
+		this.cash = cash;
+		this.description = description;
+		this.type = type;
+		this.userId = userId;
+	}
+	
+	
+	public Tickets(int userId, int ticketId, int statusId, String firstName, String lastName, double cash, String submit, String resolved, String description,
+			String status) {
+		super();
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.cash = cash;
+		this.submit = submit;
+		this.resolved = resolved;
+		this.description = description;
+		this.status = status;
+		this.userId = userId;
+		this.ticketId = ticketId;
+		this.statusId = statusId;
+	}
+	
+	public Tickets(String firstName, String lastName, double cash, String submit, String resolved, String description,
+			String status) {
+		super();
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.cash = cash;
+		this.submit = submit;
+		this.resolved = resolved;
+		this.description = description;
+		this.status = status;
+	}
+
+
+
+	public Tickets(String firstName, String lastName, double cash, String submit, String resolved, String description,
+			String status, int type, int userId, int roleId, String email, String userName, String password) {
+		super();
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.cash = cash;
+		this.submit = submit;
+		this.resolved = resolved;
+		this.description = description;
+		this.status = status;
+		this.type = type;
+		this.userId = userId;
+		this.roleId = roleId;
+		this.email = email;
+		this.userName = userName;
+		this.password = password;
+	}
+
+	
+
+	public int getTicketId() {
+		return ticketId;
+	}
+
+	public void setTicketId(int ticketId) {
+		this.ticketId = ticketId;
+	}
+
+	public int getStatusId() {
+		return statusId;
+	}
+
+	public void setStatusId(int statusId) {
+		this.statusId = statusId;
+	}
+
+	public int getUserId() {
+		return userId;
+	}
+
+	public void setUserId(int userId) {
+		this.userId = userId;
+	}
+
+	public int getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(int roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public void setType(int type) {
+		this.type = type;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+
+	public String getLastName() {
+		return lastName;
+	}
+
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+
+	public double getCash() {
+		return cash;
+	}
+
+
+	public void setCash(double cash) {
+		this.cash = cash;
+	}
+
+
+	public String getSubmit() {
+		return submit;
+	}
+
+
+	public void setSubmit(String submit) {
+		this.submit = submit;
+	}
+
+
+	public String getResolved() {
+		return resolved;
+	}
+
+
+	public void setResolved(String resolved) {
+		this.resolved = resolved;
+	}
+
+
+	public String getDescription() {
+		return description;
+	}
+
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+
+	public String getStatus() {
+		return status;
+	}
+
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	
+	
+	@Override
+	public String toString() {
+		return "Tickets [firstName=" + firstName + ", lastName=" + lastName + ", cash=" + cash + ", submit=" + submit
+				+ ", resolved=" + resolved + ", description=" + description + ", status=" + status + ", type=" + type
+				+ ", userId=" + userId + ", ticketId=" + ticketId + ", statusId=" + statusId + ", roleId=" + roleId
+				+ ", email=" + email + ", userName=" + userName + ", password=" + password + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		long temp;
+		temp = Double.doubleToLongBits(cash);
+		result = prime * result + (int) (temp ^ (temp >>> 32));
+		result = prime * result + ((description == null) ? 0 : description.hashCode());
+		result = prime * result + ((firstName == null) ? 0 : firstName.hashCode());
+		result = prime * result + ((lastName == null) ? 0 : lastName.hashCode());
+		result = prime * result + ((resolved == null) ? 0 : resolved.hashCode());
+		result = prime * result + ((status == null) ? 0 : status.hashCode());
+		result = prime * result + ((submit == null) ? 0 : submit.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Tickets other = (Tickets) obj;
+		if (Double.doubleToLongBits(cash) != Double.doubleToLongBits(other.cash))
+			return false;
+		if (description == null) {
+			if (other.description != null)
+				return false;
+		} else if (!description.equals(other.description))
+			return false;
+		if (firstName == null) {
+			if (other.firstName != null)
+				return false;
+		} else if (!firstName.equals(other.firstName))
+			return false;
+		if (lastName == null) {
+			if (other.lastName != null)
+				return false;
+		} else if (!lastName.equals(other.lastName))
+			return false;
+		if (resolved == null) {
+			if (other.resolved != null)
+				return false;
+		} else if (!resolved.equals(other.resolved))
+			return false;
+		if (status == null) {
+			if (other.status != null)
+				return false;
+		} else if (!status.equals(other.status))
+			return false;
+		if (submit == null) {
+			if (other.submit != null)
+				return false;
+		} else if (!submit.equals(other.submit))
+			return false;
+		return true;
+	}
+
+
+	
+	
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/pojos/User.java b/Project1/ersV2/src/main/java/com/revature/pojos/User.java
new file mode 100755
index 000000000..5050b6e41
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/pojos/User.java
@@ -0,0 +1,152 @@
+package com.revature.pojos;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class User {
+	private int userId;
+	private String username;
+	private String password;
+	private String firstName;
+	private String lastName;
+	private String email;
+	private int roleId;
+	
+	public User() {}
+	
+	public User(String userName, String password) {
+		this.username = userName;
+		this.password = password;		
+	}
+	
+	public User(int userId, String userName, String password, String firstName, String lastName, String email,
+			int roleId) {
+		super();
+		this.userId = userId;
+		this.username = userName;
+		this.password = password;
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.email = email;
+		this.roleId = roleId;
+	}
+
+	public int getUserId() {
+		return userId;
+	}
+
+	public void setUserId(int userId) {
+		this.userId = userId;
+	}
+
+	public String getUserName() {
+		return username;
+	}
+
+	public void setUserName(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public int getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(int roleId) {
+		this.roleId = roleId;
+	}
+
+	@Override
+	public String toString() {
+		return "Users [userId=" + userId + ", userName=" + username + ", password=" + password + ", firstName="
+				+ firstName + ", lastName=" + lastName + ", email=" + email + ", roleId=" + roleId + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((email == null) ? 0 : email.hashCode());
+		result = prime * result + ((firstName == null) ? 0 : firstName.hashCode());
+		result = prime * result + ((lastName == null) ? 0 : lastName.hashCode());
+		result = prime * result + ((password == null) ? 0 : password.hashCode());
+		result = prime * result + roleId;
+		result = prime * result + userId;
+		result = prime * result + ((username == null) ? 0 : username.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		User other = (User) obj;
+		if (email == null) {
+			if (other.email != null)
+				return false;
+		} else if (!email.equals(other.email))
+			return false;
+		if (firstName == null) {
+			if (other.firstName != null)
+				return false;
+		} else if (!firstName.equals(other.firstName))
+			return false;
+		if (lastName == null) {
+			if (other.lastName != null)
+				return false;
+		} else if (!lastName.equals(other.lastName))
+			return false;
+		if (password == null) {
+			if (other.password != null)
+				return false;
+		} else if (!password.equals(other.password))
+			return false;
+		if (roleId != other.roleId)
+			return false;
+		if (userId != other.userId)
+			return false;
+		if (username == null) {
+			if (other.username != null)
+				return false;
+		} else if (!username.equals(other.username))
+			return false;
+		return true;
+	}
+	
+	
+
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/service/TicketsService.java b/Project1/ersV2/src/main/java/com/revature/service/TicketsService.java
new file mode 100755
index 000000000..885e6b792
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/service/TicketsService.java
@@ -0,0 +1,29 @@
+package com.revature.service;
+
+
+import java.util.List;
+
+import com.revature.dao.Dao;
+import com.revature.dao.TicketDao;
+import com.revature.pojos.Tickets;
+
+public class TicketsService {
+	static Dao<Tickets, Integer> tickdao = new TicketDao();
+	
+	public List<Tickets> getAllTickets(){
+		return tickdao.getAll();
+	}
+	
+	public List<Tickets> getAllTickets_ofUser(int userId){
+		return tickdao.getAllOfUser(userId);
+	}
+	
+	public Tickets addTicket(Tickets t) {
+		return tickdao.save(t);
+	}
+	
+	public Tickets updateTicket(Tickets t) {
+		return tickdao.update(t);
+	}
+
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/service/UserService.java b/Project1/ersV2/src/main/java/com/revature/service/UserService.java
new file mode 100755
index 000000000..8a6c5407e
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/service/UserService.java
@@ -0,0 +1,26 @@
+package com.revature.service;
+
+import java.util.List;
+import com.revature.dao.Dao;
+import com.revature.dao.DaoUser;
+
+import com.revature.pojos.User;
+
+
+public class UserService {
+
+	static Dao<User, Integer> daouser = new DaoUser();
+	
+	public List<User> getAllUsers(){
+		return daouser.getAll();
+	}
+	
+	public User addUser(User u) {
+		return daouser.save(u);
+	}
+	
+	public User getOneUser(String s) {
+		return daouser.findOne(s);
+	}
+	
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/servlets/EmployeeServlet.java b/Project1/ersV2/src/main/java/com/revature/servlets/EmployeeServlet.java
new file mode 100755
index 000000000..cf8a8a7d7
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/servlets/EmployeeServlet.java
@@ -0,0 +1,63 @@
+package com.revature.servlets;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.pojos.Tickets;
+import com.revature.service.TicketsService;
+
+@WebServlet("/employee")
+public class EmployeeServlet extends HttpServlet{
+	
+	static TicketsService ts = new TicketsService();
+	
+	@Override
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		
+		System.out.println("Inside the doPost of employee");
+		
+		BufferedReader br = new BufferedReader(new InputStreamReader(req.getInputStream()));
+        String json = "";
+        if(br != null){
+            json = br.readLine();
+        }
+        System.out.println(json);
+        ObjectMapper mapper = new ObjectMapper();
+        
+        Tickets b = mapper.readValue(json, Tickets.class);
+        
+        System.out.println(b.toString());
+        System.out.println("AMOUNT: " + b.getCash());
+        
+        ts.addTicket(b);
+
+//////////////////////////////////////////////////////////////////////
+        
+		int user_id = Integer.parseInt(req.getParameter("userId"));
+		
+		List<Tickets> tickets = ts.getAllTickets_ofUser(user_id);
+        
+//		List<Tickets> tickets = ts.getAllTickets();
+		
+		ObjectMapper responseMapper = new ObjectMapper();
+		String responseJson = responseMapper.writeValueAsString(tickets);
+		PrintWriter out = resp.getWriter();
+		
+//		System.out.println(json);
+		
+		resp.setContentType("application/json");
+		out.write(responseJson);
+        
+        
+	}   
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/servlets/LoadHomeViewServlet.java b/Project1/ersV2/src/main/java/com/revature/servlets/LoadHomeViewServlet.java
new file mode 100755
index 000000000..c944d6df7
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/servlets/LoadHomeViewServlet.java
@@ -0,0 +1,29 @@
+package com.revature.servlets;
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+@WebServlet("/ers")
+public class LoadHomeViewServlet extends HttpServlet{
+
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		System.out.println("inside doGet of LoadHome");
+		System.out.println(req.getRequestURI());
+		req.getRequestDispatcher("ers.html").forward(req, resp);
+		
+		
+	}
+	
+	@Override
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		System.out.println("in doPost");
+		resp.setContentType("text/html");
+		resp.sendRedirect("partials/homeView.html");
+	}
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/servlets/LoadViewsServlet.java b/Project1/ersV2/src/main/java/com/revature/servlets/LoadViewsServlet.java
new file mode 100755
index 000000000..4697aee13
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/servlets/LoadViewsServlet.java
@@ -0,0 +1,64 @@
+package com.revature.servlets;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+//@WebServlet("/lol")
+public class LoadViewsServlet extends HttpServlet{
+	private static Logger log = Logger.getLogger(LoadViewsServlet.class);
+	
+	@Override
+	public void init() throws ServletException {
+		super.init();
+		log.trace("Starting LoadViewsServlet");
+	}
+
+	@Override
+	public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+				
+		System.out.println("----> " + req.getRequestURI());
+		
+		String resource = "partials/" + process(req, resp) + ".html";
+		resp.addHeader("Access-Control-Allow-Origin", "*");
+
+		req.getRequestDispatcher(resource).forward(req, resp);
+	}
+	
+	static String process(HttpServletRequest req, HttpServletResponse resp) {
+		
+		log.info("Request Sent to: " + req.getRequestURI());
+		
+		//log.info("Path: " + req.getPathInfo());
+		
+		switch(req.getRequestURI()) {
+				
+			case "/ers/home.view":
+				return "homeView";
+				
+			case "/ers/table.view":
+				return "tableView";
+				
+			case "/ers/login.view":
+				return "loginView";
+				
+			case "/ers/about.view":
+				return"aboutView";
+				
+			case "/ers/newTicket.view":
+				return"newTicketView";			
+
+		default:
+			return "errorView";
+		}
+				
+		
+	}
+	
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/servlets/LoginServlet.java b/Project1/ersV2/src/main/java/com/revature/servlets/LoginServlet.java
new file mode 100755
index 000000000..bd778b5af
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/servlets/LoginServlet.java
@@ -0,0 +1,38 @@
+package com.revature.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.pojos.User;
+import com.revature.service.UserService;
+
+@WebServlet("/login")
+public class LoginServlet extends HttpServlet {
+	
+	UserService service = new UserService();
+	
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		
+		List<User> userInfo = service.getAllUsers();
+		ObjectMapper mapper = new ObjectMapper();
+		String json = mapper.writeValueAsString(userInfo);
+		PrintWriter out = resp.getWriter();
+		resp.setContentType("application/json");
+		
+		System.out.println("we are responding with -> ");
+		System.out.println(json);
+		
+		out.write(json);
+		
+	}
+
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/servlets/TicketServlet.java b/Project1/ersV2/src/main/java/com/revature/servlets/TicketServlet.java
new file mode 100755
index 000000000..76292b723
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/servlets/TicketServlet.java
@@ -0,0 +1,111 @@
+package com.revature.servlets;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.pojos.Tickets;
+import com.revature.service.TicketsService;
+
+@WebServlet("/ticket")
+public class TicketServlet extends HttpServlet{
+	
+	TicketsService ts = new TicketsService();
+	
+	@Override
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		
+		/*
+		 * 
+		 * 	statusId,
+		 *	userId:	
+		 *	ticketId
+		 * 
+		 * */
+		
+		System.out.println("Inside the doPost of employee");
+		
+		BufferedReader br = new BufferedReader(new InputStreamReader(req.getInputStream()));
+        String json = "";
+        if(br != null){
+            json = br.readLine();
+        }
+        System.out.println(json);
+        
+        ObjectMapper mapper = new ObjectMapper();
+        Tickets ticket = mapper.readValue(json, Tickets.class);
+        
+        System.out.println("ticket toString() ");
+        System.out.println(ticket.toString());
+        
+//        userId=2, ticketId=22, statusId=2
+        
+//        ts.addTicket(b);
+        ts.updateTicket(ticket);
+        
+        System.out.println("After ticket update");
+
+//////////////////////////////////////////////////////////////////////
+        
+//		int user_id = Integer.parseInt(req.getParameter("userId"));
+		
+//		List<Tickets> tickets = ts.getAllTickets_ofUser(user_id);
+        
+//		List<Tickets> tickets = ts.getAllTickets();
+		
+//		ObjectMapper responseMapper = new ObjectMapper();
+//		String responseJson = responseMapper.writeValueAsString(tickets);
+		PrintWriter out = resp.getWriter();
+		
+//		System.out.println(json);
+		
+		resp.setContentType("application/json");
+		out.write("I responded");
+		
+		
+		
+	}
+	
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {	
+		
+		List<Tickets> tickets = null;
+		System.out.println("hitting ticket servlet");
+		
+		String userId = req.getParameter("userId");
+		String roleId = req.getParameter("roleId");
+		
+		
+		int user_id = Integer.parseInt(userId);
+		
+		if (!roleId.equals("2")) {
+			System.out.println("we are employee");
+			tickets = ts.getAllTickets_ofUser(user_id);
+		}
+		else {	 // roleId ---> 2	
+			System.out.println("we are manager!");
+			tickets = ts.getAllTickets();
+			System.out.print("--> " + tickets.toString());
+		}
+		
+		
+		ObjectMapper mapper = new ObjectMapper();
+		String json = mapper.writeValueAsString(tickets);
+		PrintWriter out = resp.getWriter();
+		
+//		System.out.println(json);
+		
+		resp.setContentType("application/json");
+		out.write(json);
+	}
+	
+}
diff --git a/Project1/ersV2/src/main/java/com/revature/util/ConnectionFactory.java b/Project1/ersV2/src/main/java/com/revature/util/ConnectionFactory.java
new file mode 100755
index 000000000..44a25e332
--- /dev/null
+++ b/Project1/ersV2/src/main/java/com/revature/util/ConnectionFactory.java
@@ -0,0 +1,54 @@
+package com.revature.util;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+public class ConnectionFactory {
+
+	private static ConnectionFactory cf = null;
+	private static Boolean build = true;
+	
+	private ConnectionFactory() {
+		build = false;
+	}
+	
+	public static synchronized ConnectionFactory getInstance() {
+		if (build) cf = new ConnectionFactory();
+		return cf;
+	}
+	
+	public Connection getConnection() {
+		
+		Connection conn = null;
+		Properties prop = new Properties();
+		String path = "/Users/omaracevedo/my_git_repos/1807Jul30Java/Omar_Acevedo_Code/ersV2/src/main/resources/application.properties";
+		
+		try {
+			
+			prop.load(new FileReader(path));
+			Class.forName(prop.getProperty("driver"));
+			conn = DriverManager.getConnection(
+					prop.getProperty("url"),
+					prop.getProperty("usr"),
+					prop.getProperty("pwd"));
+			
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			e.printStackTrace();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+		
+		return conn;
+		
+	}
+	
+}
diff --git a/Project1/ersV2/src/main/resources/application.properties b/Project1/ersV2/src/main/resources/application.properties
new file mode 100755
index 000000000..511a8469c
--- /dev/null
+++ b/Project1/ersV2/src/main/resources/application.properties
@@ -0,0 +1,4 @@
+driver=oracle.jdbc.driver.OracleDriver
+url=jdbc:oracle:thin:@demo01.cy9qioorxoia.us-east-1.rds.amazonaws.com:1521/ORCL
+usr=DemoUser
+pwd=password
diff --git a/Project1/ersV2/src/main/resources/log4j.properties b/Project1/ersV2/src/main/resources/log4j.properties
new file mode 100755
index 000000000..71dbe5d40
--- /dev/null
+++ b/Project1/ersV2/src/main/resources/log4j.properties
@@ -0,0 +1,15 @@
+# Root logger options. Where do we want to log to?
+log4j.rootLogger = ALL, stdout, file
+
+# define stdout log messages
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+
+# define file log messages
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=log.txt
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
\ No newline at end of file
diff --git a/Project1/ersV2/src/main/webapp/WEB-INF/web.xml b/Project1/ersV2/src/main/webapp/WEB-INF/web.xml
new file mode 100755
index 000000000..648ec590a
--- /dev/null
+++ b/Project1/ersV2/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app>
+  <display-name>ERS Application</display-name>
+<servlet>
+	<servlet-name>FrontController</servlet-name>
+	<servlet-class>com.revature.servlets.LoadViewsServlet</servlet-class>
+	<load-on-startup>1</load-on-startup>
+</servlet>
+<servlet-mapping>
+	<servlet-name>FrontController</servlet-name>
+	<url-pattern>*.view</url-pattern>
+</servlet-mapping>
+</web-app>
diff --git a/Project1/ersV2/src/main/webapp/ers.html b/Project1/ersV2/src/main/webapp/ers.html
new file mode 100755
index 000000000..26d8c4e02
--- /dev/null
+++ b/Project1/ersV2/src/main/webapp/ers.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+
+	<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/dt/dt-1.10.18/datatables.min.css" />
+	
+	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
+		integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+		
+	<link rel="stylesheet" type="text/css" href="./styles/styles.css" />
+
+	<title>ERS</title>
+</head>
+<body>
+
+	<nav class="navbar navbar-expand-lg navbar-light bg-light">
+
+		<!-- <a class="navbar-brand" href="#">Navbar</a> -->
+
+		<button class="navbar-toggler" type="button" data-toggle="collapse"
+			data-target="#navbarSupportedContent"
+			aria-controls="navbarSupportedContent" aria-expanded="false"
+			aria-label="Toggle navigation">
+
+			<span class="navbar-toggler-icon"></span>
+
+		</button>
+
+
+		<div class="collapse navbar-collapse" id="navbarSupportedContent">
+
+			<ul class="navbar-nav mr-auto" id="mainMenuNav">
+
+				<li class="nav-item active"><a class="nav-link" href="#aboutme"
+					id="home">Home <span class="sr-only">(current)</span>
+				</a></li>
+
+				<li class="nav-item"><a class="nav-link" id="about" href="#">About</a>
+				</li>
+
+				<li class="nav-item"><a class="nav-link" href="#" id="myStatementButton">View Statements</a>
+				</li>
+
+				<li class="nav-item"><a class="nav-link" id="logoutButton" href="#">Logout</a>
+				</li>
+			</ul>
+
+		</div>
+		<br>
+
+	</nav>
+
+	<div id="viewLoader">...</div>
+
+
+	<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
+		integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
+		crossorigin="anonymous"></script>
+	<script
+		src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
+		integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
+		crossorigin="anonymous"></script>
+	<script
+		src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
+		integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
+		crossorigin="anonymous"></script>
+
+	<script type="text/javascript"
+		src="https://cdn.datatables.net/v/dt/dt-1.10.18/datatables.min.js"></script>
+		
+	<script src="./js/ers.js"></script>
+	
+</body>
+</html>
\ No newline at end of file
diff --git a/Project1/ersV2/src/main/webapp/js/ers.js b/Project1/ersV2/src/main/webapp/js/ers.js
new file mode 100755
index 000000000..b9d488f7b
--- /dev/null
+++ b/Project1/ersV2/src/main/webapp/js/ers.js
@@ -0,0 +1,618 @@
+window.onload = function() {
+	
+	globalObject = {};
+	g_userId = 0;
+	
+	console.log(g_userId);
+
+	g_userId++;
+	
+	console.log(g_userId);
+	
+	
+	loadLogInView();
+	
+//	loadHomeView();
+	
+	g_userId++;
+
+	console.log(g_userId);
+
+	$('#home').on('click', loadHomeView);
+    $("#about").on("click", loadAboutView);
+    $('#myStatementButton').on('click', viewTable);
+    $("#logoutButton").on('click', loadLogInView);
+    
+}
+
+//$(document).ready(function() {
+//    $("#entireTab tr:has(td)").mouseover(function(e) {
+//        $(this).css("cursor", "pointer");
+//    });
+//    $("#entireTab tr:has(td)").click(function(e) {
+//        $("#entireTab td").removeClass("highlight");
+//        var clickedCell = $(e.target).closest("td");
+//        clickedCell.addClass("highlight");
+//        $("#spnText").html(
+//            'Clicked table cell value is: <b> ' + clickedCell.text() + '</b>');
+//    });
+//});
+
+
+
+// 		 Load Home View
+function loadHomeView() {
+	
+    console.log("Loading HomeView");
+
+	var xhr = new XMLHttpRequest();
+    xhr.onreadystatechange = function(){
+    	
+    	console.log('xhr.readyState -> ' + xhr.readyState);
+    	console.log('xhr.status -> ' + xhr.status);
+    	
+        if(xhr.readyState == 4 && xhr.status == 200){
+        	console.log(xhr.responseText);
+        	$('#viewLoader').html(xhr.responseText);     	   	
+        }
+    }
+    
+//    setTimeout(function() {
+    	xhr.open("GET", 'home.view', true);
+    	xhr.send();  
+//    }, 1000);
+    
+}
+
+//		Load About View
+function loadAboutView() {
+	
+    console.log("Loading AboutView");
+
+	var xhr = new XMLHttpRequest();
+    xhr.onreadystatechange = function(){
+        if(xhr.readyState == 4 && xhr.status == 200){
+        	$('#viewLoader').html(xhr.responseText);     	   	
+        }
+    }
+    xhr.open("GET", 'about.view', true);
+    xhr.send();      
+}
+
+
+//		 Show statements
+//function viewTable(obj){
+function viewTable() {
+	
+	console.log("======================");
+//	console.log(obj);
+	
+	var xhr = new XMLHttpRequest();
+	
+    xhr.onreadystatechange = function() {
+
+        if(xhr.readyState == 4 && xhr.status == 200) {
+        	
+        	console.log('gonna get statements');
+        	console.log(xhr.responseText);
+        	
+        	console.log(globalObject);
+        	
+        	if (globalObject.roleId == 1) {
+        		
+//        		alert('employee info');
+        		
+	        	$('#viewLoader').html(xhr.responseText);   
+	        	$('#ticketsManagerForm').hide();
+	        	$('#ticketsForm').show();
+	
+	            // js to control drop down
+		    	$(".dropdown-menu li a").click(function () {
+		    	  var selText = $(this).text();
+		    	  $(this).closest('.form-group').find('#expenseTypeTxt').val(selText);
+		    	});
+
+	            $('#newTicketButton').on('click', function() {
+	            	
+	            	console.log(' inside the click function');
+	            	
+	            	// Expense type
+	            	var type = $('#expenseTypeTxt').val();
+	            	
+	            	// Expense description
+	            	var descrip = $('#descriptionText').val();
+	            	
+	            	// Expense cash
+	            	var cash = $('#cashMoneyYall').val();
+	            	
+	//            	sendTicket(obj, type, descrip, cash);
+	            	sendTicket(type, descrip, cash);
+	            	
+	            	$('#expenseTypeTxt').val('');
+	            	$('#descriptionText').val('');
+	            	$('#cashMoneyYall').val('');
+	
+	            })
+	            
+        	} //end of roleId if
+        	else if (globalObject.roleId == 2) {
+        		
+//        		alert('manager info');
+        		
+        		$('#viewLoader').html(xhr.responseText);  
+        		$('#ticketsForm').hide();
+        		$('#ticketsManagerForm').show();
+        		
+        	}
+            
+    	  // Here, we make another AJAX call to get JSON data of tickets
+	    	  
+    	  populateTicketsTable();
+	    	  
+    	  // End of JSON get request
+
+        }
+
+    }
+    xhr.open("GET", 'table.view', true);
+    xhr.send();
+}
+
+
+//function populateUserTable() {
+function populateTicketsTable() {
+	
+    var xhr = new XMLHttpRequest();
+    
+    xhr.onreadystatechange = function(){
+    	
+        if(xhr.readyState == 4 && xhr.status == 200){
+        	
+//          user = JSON.parse(xhr.responseText);
+            tickets = JSON.parse(xhr.responseText);
+            
+            console.log(tickets);
+            
+            var $dropdown = $("#allTicketsList");
+            $.each(tickets, function() {
+            	var ticketName = "Ticket # " + this.ticketId + "" + this.userId + " (" + this.status + ")";
+                $dropdown.append($("<option />").val(this.ticketId).text(ticketName));
+                
+                console.log("Ticket # " + this.ticketId + "" + this.userId + " (" + this.status + ")");
+            });
+            
+            var ticketId_toUpdate = 0;
+            
+        	$('#allTicketsList').change(function() {
+        		
+        		console.log($(this).val());
+        		
+        		ticketId_toUpdate = parseInt($(this).val());
+        		
+        		var ticketAuthor = tickets.filter(x => parseInt(x.ticketId) == parseInt($(this).val()))[0].firstName;
+        		var ticketAmount = tickets.filter(x => parseInt(x.ticketId) == parseInt($(this).val()))[0].cash;
+        		var ticketDescription = tickets.filter(x => parseInt(x.ticketId) == parseInt($(this).val()))[0].description;
+        		
+        		$('#ticketAuthor').html(ticketAuthor);
+        		$('#ticketAmount').html(ticketAmount);
+        		$('#ticketDescription').html(ticketDescription);
+        		
+        	});
+        	
+        	$('#ticketStatus').change(function() {
+    			var statusId = $(this).val();
+    			updateTicketStatus(statusId, globalObject.userId, ticketId_toUpdate);
+        	});
+            
+            $('#entireTab tbody').html('');
+            for(var b of tickets){
+                addUserToTable(b); 
+            }
+            
+            // https://www.learningjquery.com/2017/09/get-html-table-cell-value-using-jquery
+//            $("#entireTab tr:has(td)").mouseover(function(e) {
+//                $(this).css("cursor", "pointer");
+//            });
+//            $("#entireTab tr:has(td)").click(function(e) {
+//                $("#entireTab td").removeClass("highlight");
+//                var clickedCell = $(e.target).closest("td");
+//                clickedCell.addClass("highlight");
+//                $("#spnText").html(
+//                    'Clicked table cell value is: <b> ' + clickedCell.text() + '</b>');
+//            });
+            
+            //https://codereview.stackexchange.com/questions/14295/select-row-based-on-another-table-row-index
+//            $('#entireTab tbody td').click(function() {
+//            	
+//                var rowIndex = $(this).parent().index();
+//                $('#spnText').html(rowIndex);
+//
+//                var myData= [];
+//
+//                $($('#entireTab tbody tr')[rowIndex]).map(function() {
+//                	
+//                    return $(this.cells).get();
+//                    
+//                }).each(function() {
+//                	
+//                    var headerVal = $(this).closest('table').find('thead th').eq($(this).index()).html();
+//                    
+//                    myData.push([headerVal,parseFloat($(this).html())]);
+//                    
+//                });
+//
+////                alert(myData);
+//                console.log(myData);
+//            });
+            
+        }
+
+    }
+    
+    console.log('globalObject.userId -> ' + globalObject.userId);
+    
+//    xhr.open("GET", 'ticket', true);
+    xhr.open("GET", 'ticket?userId='+globalObject.userId+"&roleId="+globalObject.roleId, true);
+    xhr.send();
+}
+
+// Update reimbursement status id
+function updateTicketStatus(statusId, userId, ticketId_toUpdate) {
+	
+	var dataToPost = {
+		statusId: statusId,
+		userId:	userId,
+		ticketId: ticketId_toUpdate
+	};
+	
+	dataToPost = JSON.stringify(dataToPost);
+	
+	var xhr = new XMLHttpRequest();
+	xhr.onreadystatechange = function() {
+		if(xhr.readyState == 4 && xhr.status == 200) {
+			
+			var jsonResponse =  xhr.responseText;
+//			var jsonResponse = JSON.parse(xhr.responseText);
+			
+			console.log('jsonResponse: ');
+			console.log(jsonResponse);
+			
+		}
+	}
+	xhr.open('POST', 'ticket', true);
+	xhr.send(dataToPost);
+}
+
+function addUserToTable(b){
+	
+    var row = document.createElement("tr");
+    
+//    var cellTest = document.createElement("td");
+    var cell1 = document.createElement("td");
+    var cell2 = document.createElement("td");
+    var cell3 = document.createElement("td");
+    var cell4 = document.createElement("td");
+    var cell5 = document.createElement("td");
+    var cell6 = document.createElement("td");
+    var cell7 = document.createElement("td");  
+    
+//    cellTest.innerHTML = b.userId;
+//    cellTest.innerHTML = globalObject.userId
+
+    cell1.innerHTML = b.firstName;
+    cell2.innerHTML = b.lastName;
+    cell3.innerHTML = b.cash;
+    cell4.innerHTML = b.submit;
+    cell5.innerHTML = b.resolved;
+    cell6.innerHTML = b.description;
+    cell7.innerHTML = b.status;
+    
+//    row.appendChild(cellTest);
+    row.appendChild(cell1);
+    row.appendChild(cell2);
+    row.appendChild(cell3);
+    row.appendChild(cell4);
+    row.appendChild(cell5);
+    row.appendChild(cell6);
+    row.appendChild(cell7);
+    
+//    $('#entireTab tbody').html('');
+//    document.getElementById("entireTab").appendChild(row);
+    document.getElementById("entireTab").getElementsByTagName('tbody')[0].appendChild(row);
+//    $('#entireTab tbody').append(row);
+}
+
+
+/*  
+ * 
+ * Post ticket data
+ * 
+ * */
+
+// Function below is being called by click event of $('#newTicketButton') element.
+//function sendTicket(obj, type, description, cash){
+function sendTicket(type, description, cash){
+			//object, type, descrip, cash
+	
+	if(type == 'Lodging')
+		type = 1;
+	else if(type == 'Food')
+		type = 2;
+	else (type = 3)
+	
+	console.log(type);
+	
+    var xhr = new XMLHttpRequest();
+    
+    var newObj = new Object();
+    newObj.cash = cash;
+    newObj.type = type;
+    newObj.description = description;
+    
+//  newObj.userId = 1;
+    newObj.userId = globalObject.userId;
+    
+//    newObj.userId = obj.userId;
+    
+//    newObj.roleId = obj.roleId;
+//    newObj.email = obj.email;
+//    newObj.userName = obj.userName;
+//    newObj.password = obj.password;
+//    newObj.firstName = obj.firstName;
+//    newObj.lastName = obj.lastName;
+    
+    console.log('js object');
+    console.log(newObj);
+    
+    var strObj = JSON.stringify(newObj);
+    
+	console.log('json object');
+	console.log(strObj);
+	
+    xhr.onreadystatechange = function(){
+        if(xhr.readyState == 4 ){
+        	
+			console.log('data response from server');
+			console.log(xhr.responseText);
+			
+            tickets = JSON.parse(xhr.responseText);
+            
+            console.log('--->');
+            console.log(tickets);
+            
+            $('#entireTab tbody').html('');
+            for(var b of tickets){
+                addUserToTable(b); 
+            }
+
+        }
+    }
+//    xhr.open('POST', 'employee', true);
+    xhr.open('POST', 'employee?userId='+newObj.userId, true);
+	xhr.setRequestHeader("Content-type", "application/json");
+    xhr.send(strObj);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+/*  
+ * 
+ * Log In Section
+ * 
+ * */
+
+function loadLogInView() {
+	
+	console.log("inside my login div");
+	$('nav').hide();
+	
+	var xhr = new XMLHttpRequest();
+	
+	xhr.onreadystatechange = function(){
+		
+		
+		if(xhr.readyState == 4 && xhr.status == 200){
+
+			
+			console.log("inside my login ajax");
+			
+			console.log(xhr.responseText);
+			
+			$('#viewLoader').html(xhr.responseText);
+			
+		    $('#loginViewButton').on('click', loginValues);
+		    
+		}
+		
+	}
+	xhr.open('GET', 'login.view', true);
+	xhr.send();
+}
+
+function loginValues() {
+	
+	console.log(1);
+	console.log('inside login Values');
+	
+	//user data
+	var uname = $('#username').val();
+    var pword = $('#password').val();
+    
+    // variable holding my drop down selection for manager or employee
+    var dropDownSelect = document.getElementById("inlineFormCustomSelect").value;
+  
+//    alert(dropDownSelect + " The dropdown selection!");
+    
+    console.log(uname);
+    console.log(pword);
+    
+    if (dropDownSelect == '') {
+    	alert('Select a role');
+    	return false;
+    }
+    
+    getInfo(uname, pword, dropDownSelect);
+    
+    console.log('after getinfo');
+    
+    return false;		/// PLEASE DO NOT DELEETE THIS LINE
+}
+
+
+function getInfo(uname, pword, dropDownSelect){
+	
+    console.log('Loading credentials');
+	var xhr = new XMLHttpRequest();
+	
+    var count = 0;
+    var uNum = 0;
+    
+    xhr.onreadystatechange = function() {
+
+    	console.log('xhr.readyState -> ' + xhr.readyState);
+    	console.log('xhr.status -> ' + xhr.status);
+    	
+        if(xhr.readyState == 4 && xhr.status == 200) {
+
+            var myObj = JSON.parse(xhr.responseText);
+            
+            myObj.forEach(function(arrayItem){
+            	
+            	if(arrayItem.userName == uname){
+        			console.log('uname value is -> ' + uname);
+            		uNum = count;
+            	}
+            	
+            	count++;
+            	
+            });
+            
+            console.log('before the ifs');
+            
+            if(myObj[uNum].userName == uname & myObj[uNum].password == pword) {
+            	
+            	console.log('Role id is -> ' + myObj[uNum].roleId);
+            	
+            	if ( ( myObj[uNum].roleId == 1 ) && ( myObj[uNum].roleId == dropDownSelect ) ) {
+            	
+            		alert('you are an employee');
+            		
+//            		viewTable(myObj[uNum]);
+            		console.log('will now load home view');
+            		
+            		globalObject = myObj[uNum];
+            		
+            		$('nav').show();
+            		loadHomeView();
+            		
+            	} else if ( ( myObj[uNum].roleId == 2 ) && ( myObj[uNum].roleId == dropDownSelect ) ) {
+//            	
+            		alert('you are a manager');
+            		
+            		globalObject = myObj[uNum];
+            		
+            		$('nav').show();
+//            		viewManagerTable(myObj[uNum]);    
+            		loadHomeView();
+            	
+            	}
+            	
+            }else {
+            	console.log(myObj[uNum].roleId);
+            	console.log("Invalid username/password");
+            	loadLogInView();
+            }
+        }
+    }
+    
+    xhr.open("GET", "login", true);
+//    xhr.open("GET", "http://localhost:8080/ers/login");
+//    xhr.open("GET", "http://localhost:8081/ers/login");
+    xhr.send();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+function viewManagerTable(){
+	console.log("need to implement this")
+}
+
+function submitUser(){
+    var ui = $('#userId').val();
+    var uri = $('#userRoleId').val();
+    var ue = $('#userEmail').val();
+    var un = $('#userName').val();
+    var p = $('#password').val();
+    var fn = $('#firstname').val();
+    var ln = $('#lastname').val();
+
+    var users = {
+            firstname: fn, 
+            lastname: ln,
+            password: p,
+            useremail: ue,
+            username: un,
+            userroleid: uri,
+            usersid: ui
+    };
+
+    var xhr = new XMLHttpRequest();
+    xhr.onreadystatechange = function(){
+        if(xhr.readyState == 4 ){
+            console.log(xhr.responseText);
+            let b = JSON.parse(xhr.responseText);
+            addUserToTable(b);
+        }
+    }
+        xhr.open('POST', 'user', true);
+        xhr.send(JSON.stringify(users));
+}
+
+
+//function newTicketView(){
+//    console.log("Loading newTicketView");
+//
+//    var xhr = new XMLHttpRequest();
+//    
+//    xhr.onreadystatechange = function(){
+//    	
+//        if(xhr.readyState == 4 && xhr.status == 200){
+//        	
+//        	$('#viewLoader').html(xhr.responseText);     	
+//
+//        }
+//}
+//    xhr.open("GET", 'newTicket.view', true);
+//    xhr.send();
+//	
+//}
+////////////////////////////////////////////////////////////////
+//function createTicket(x, y, z) {
+//	   console.log('Loading createTicket to submit');
+//		var xhr = new XMLHttpRequest();
+//	    var count = 0;
+//	    var uNum = 0;
+//	    
+//	    
+//	    
+//	    xhr.onreadystatechange = function(){
+//
+//	        if(xhr.readyState == 4 && xhr.status == 200){
+//	        	
+//	            var myObj = JSON.parse(this.responseText);
+//	            console.log(myObj);
+//	            
+//	            myObj.forEach(function(arrayItem){
+//	            	if(arrayItem.userName == uname){
+//	            		uNum = count;
+//	            	}
+//	            	count++;
+//	            });
+//	            console.log(myObj[uNum]);  
+//	            sendTicket(myObj[uNum]);
+//	        }
+//	    }
+//	    xhr.open("GET", "http://localhost:8081/ers/login");
+//	    xhr.send();	
+//}
+
diff --git a/Project1/ersV2/src/main/webapp/partials/aboutView.html b/Project1/ersV2/src/main/webapp/partials/aboutView.html
new file mode 100755
index 000000000..e2add559a
--- /dev/null
+++ b/Project1/ersV2/src/main/webapp/partials/aboutView.html
@@ -0,0 +1 @@
+<p>This is my friends attempt to help me.</p>
\ No newline at end of file
diff --git a/Project1/ersV2/src/main/webapp/partials/errorView.html b/Project1/ersV2/src/main/webapp/partials/errorView.html
new file mode 100755
index 000000000..9cf93f171
--- /dev/null
+++ b/Project1/ersV2/src/main/webapp/partials/errorView.html
@@ -0,0 +1 @@
+WHOOOOPS!
\ No newline at end of file
diff --git a/Project1/ersV2/src/main/webapp/partials/homeView.html b/Project1/ersV2/src/main/webapp/partials/homeView.html
new file mode 100755
index 000000000..65c0f9be5
--- /dev/null
+++ b/Project1/ersV2/src/main/webapp/partials/homeView.html
@@ -0,0 +1 @@
+<p>Welcome to Revature Banking!</p>
\ No newline at end of file
diff --git a/Project1/ersV2/src/main/webapp/partials/loginView.html b/Project1/ersV2/src/main/webapp/partials/loginView.html
new file mode 100755
index 000000000..491779d05
--- /dev/null
+++ b/Project1/ersV2/src/main/webapp/partials/loginView.html
@@ -0,0 +1,32 @@
+
+<form class="px-4 py-3">
+	<div class="form-group">
+		<label for="exampleDropdownFormEmail1">Username</label> <input
+			type="text" class="form-control" id="username" placeholder="Username">
+	</div>
+
+	<div class="form-group">
+		<label for="exampleDropdownFormPassword1">Password</label> <input
+			type="password" class="form-control" id="password"
+			placeholder="Password">
+	</div>
+	<div class="form-check">
+		<input type="checkbox" class="form-check-input" id="dropdownCheck">
+		<label class="form-check-label" for="dropdownCheck"> Manager </label>
+	</div>
+	<button class="btn btn-primary" id="loginViewButton">
+		Sign in
+	</button>
+	
+  <label class="mr-sm-2" for="inlineFormCustomSelect">Preference</label>
+	  
+  <select class="custom-select mb-2 mr-sm-2 mb-sm-0" id="inlineFormCustomSelect">
+    <option value="" selected>Choose...</option>
+    <option value="1">Employee</option>
+    <option value="2">Manager</option>
+
+  </select>
+</form>
+<div class="dropdown-divider"></div>
+<a class="dropdown-item" href="#">New around here? Sign up</a>
+</div>
\ No newline at end of file
diff --git a/Project1/ersV2/src/main/webapp/partials/newTicketView.html b/Project1/ersV2/src/main/webapp/partials/newTicketView.html
new file mode 100755
index 000000000..99ff18707
--- /dev/null
+++ b/Project1/ersV2/src/main/webapp/partials/newTicketView.html
@@ -0,0 +1,33 @@
+
+<div class="input-group mb-3">
+	<div class="input-group-prepend">
+		<button class="btn btn-outline-secondary dropdown-toggle"
+			type="button" data-toggle="dropdown" aria-haspopup="true"
+			aria-expanded="false">Dropdown</button>
+		<div class="dropdown-menu">
+			<a class="dropdown-item" href="#">Action</a> <a class="dropdown-item"
+				href="#">Another action</a> <a class="dropdown-item" href="#">Something
+				else here</a>
+			<div role="separator" class="dropdown-divider"></div>
+			<a class="dropdown-item" href="#">Separated link</a>
+		</div>
+	</div>
+	<input type="text" class="form-control"
+		aria-label="Text input with dropdown button">
+</div>
+
+<div class="input-group">
+	<div class="input-group-prepend">
+		<span class="input-group-text">With textarea</span>
+	</div>
+	<textarea class="form-control" aria-label="With textarea"></textarea>
+</div>
+
+<div class="input-group mb-3">
+	<div class="input-group-prepend">
+		<span class="input-group-text">$</span> <span class="input-group-text">0.00</span>
+	</div>
+	<input type="text" class="form-control"
+		aria-label="Dollar amount (with dot and two decimal places)">
+</div>
+<button type="button" class="btn btn-primary btn-lg">Submit</button>
diff --git a/Project1/ersV2/src/main/webapp/partials/tableView.html b/Project1/ersV2/src/main/webapp/partials/tableView.html
new file mode 100755
index 000000000..aa4264be3
--- /dev/null
+++ b/Project1/ersV2/src/main/webapp/partials/tableView.html
@@ -0,0 +1,109 @@
+<div style="border:1px solid black;margin:20px;padding:10px;box-shadow: 3px 4px 8px -2px #333;
+   	 		border-radius: 6px;" id="ticketsForm">
+    
+	<div class="form-group">
+		<div class="col-lg-6">
+			<div class="input-group">
+	
+				<div class="input-group-btn">
+					
+					<button type="button" class="btn btn-default" tabindex="-1">
+						Type of Expense
+					</button>
+	
+					<button type="button" class="btn btn-default dropdown-toggle"
+							data-toggle="dropdown" tabindex="-1">
+						<span class="caret"></span> 
+						<span class="sr-only">
+							Toggle Dropdown
+						</span>
+					</button>
+	
+					<ul class="dropdown-menu">
+						<li><a href="#">Lodging</a></li>
+						<li><a href="#">Food</a></li>
+						<li><a href="#">Travel</a></li>
+					</ul>
+	
+				</div>
+				
+				<input type="text" class="form-control" id="expenseTypeTxt" placeholder="">
+	
+			</div>
+		</div>
+	</div>
+	
+	<br>
+	
+	<div class="input-group">
+	
+		<div class="input-group-prepend">
+			<span class="input-group-text">Description</span>
+		</div>
+		
+		<textarea class="form-control" aria-label="With textarea"
+			id="descriptionText"></textarea>
+			
+	</div>
+	
+	<br>
+	
+	<div class="input-group">
+	
+		<span class="input-group-addon">$</span> <input type="text"
+			class="form-control" placeholder="price" id='cashMoneyYall'>
+			
+	</div>
+	
+	<button type="button" class="btn btn-primary btn-lg" id="newTicketButton">
+		Submit
+	</button>
+	
+	<br>
+	
+</div>
+
+<div id="ticketsManagerForm">
+	
+	<select id="allTicketsList">
+		<option value=""> - Select a Ticket - </option>
+	</select>
+
+	<select id="ticketStatus">
+		<option value="1">Pending</option>
+		<option value="2">Approved</option>
+		<option value="3">Denied</option>
+	</select>
+	
+	<br>
+	Ticket created by: <span id="ticketAuthor"></span>
+	<br>
+	Ticket amount: <span id="ticketAmount"></span>
+	<br>
+	Ticket description: <span id="ticketDescription"></span>
+	
+</div>
+
+	<br>
+	<p>
+		<i>Here are your statements</i>
+	</p>
+	
+	<span id="spnText"></span>
+	
+	<table class="table table-sm table-hover table-bordered thead-light" id="entireTab">
+		<thead>
+			<tr>
+				<!-- <th scope="col">tstCell</th> -->
+				<th scope="col">First Name</th>
+				<th scope="col">Last Name</th>
+				<th scope="col">Cash</th>
+				<th scope="col">Submitted Date</th>
+				<th scope="col">Resolution Date</th>
+				<th scope="col">Description</th>
+				<th scope="col">Status</th>
+			</tr>
+		</thead>
+		<tbody>
+		</tbody>
+	</table>
\ No newline at end of file
diff --git a/Project1/ersV2/src/main/webapp/styles/styles.css b/Project1/ersV2/src/main/webapp/styles/styles.css
new file mode 100755
index 000000000..c789e6de1
--- /dev/null
+++ b/Project1/ersV2/src/main/webapp/styles/styles.css
@@ -0,0 +1,36 @@
+body {
+	background-color: #efefef;
+}
+
+/* table {
+ font-family: arial, sans-serif;
+ border-collapse: collapse;
+ width: 100%;
+}
+td,
+th {
+ border: 1px solid #dddddd;
+ text-align: left;
+ padding: 8px;
+}
+th {
+ background-color: #ccd;
+}
+tr:nth-child(even) {
+ background-color: #dddddd;
+}
+tr:nth-child(odd) {
+ background-color: #ddeedd;
+}
+.highlight {
+ background-color: Yellow;
+ color: Green;
+} */
+
+#ticketsManagerForm {
+	border: 1px solid black;
+    width: 60%;
+    margin: 14px;
+    padding: 12px;
+    box-shadow: 1px 1px 5px 0px #333;
+}
\ No newline at end of file
diff --git a/Weeks3-4/assignments/Webpage/Serial.html b/Weeks3-4/assignments/Webpage/Serial.html
new file mode 100644
index 000000000..53d02b4e4
--- /dev/null
+++ b/Weeks3-4/assignments/Webpage/Serial.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Serialization</title>
+
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+
+    <style>
+            ul {
+                list-style-type: square;
+            }
+            ol.d {
+                list-style-type: lower-alpha;
+            }
+            #background {
+                position: fixed;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+                background-image: url('cat.png');
+                background-repeat: no-repeat;
+                background-attachment: fixed;
+                background-size: 60%;
+                opacity: 0.4;
+                filter:alpha(opacity=30);
+            }
+        </style>
+</head>
+
+
+<body>
+    <body>
+      <div id="background"></div>
+
+
+        <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
+          <a class="navbar-brand" href="#">Navbar</a>
+          <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+          </button>
+    
+          <div class="collapse navbar-collapse" id="navbarsExampleDefault">
+            <ul class="navbar-nav mr-auto">
+              <li class="nav-item active">
+                <a class="nav-link" href="file:///Users/dariusmoomivand/my_git_repos/1807Jul30Java/Weeks3-4/assignments/Webpage/Serial.html?#">Home <span class="sr-only">(current)</span></a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="http://gregtrowbridge.com/golang-json-serialization-with-interfaces/">Link</a>
+              </li>
+
+
+              </li>
+            </ul>
+            <form class="form-inline my-2 my-lg-0">
+              <input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search" id="mySearch">
+              <button class="btn btn-outline-success my-2 my-sm-0" type="submit" id="gSearch">Search</button>
+            </form>
+          </div>
+        </nav>
+    
+        <main role="main">
+    
+          <!-- Main jumbotron for a primary marketing message or call to action -->
+          <div class="jumbotron">
+            <div class="container">
+              <h1 class="display-3">Serialization</h1>
+              <p>Serialization is the process of translating data structures or object state into a format that can be stored (for example, in a file or memory buffer) or transmitted (for example, across a network connection link) and reconstructed later (possibly in a different computer environment).</p>
+              <p><a class="btn btn-primary btn-lg" href="#" role="button" id="LMButton">Learn more »</a></p>
+            </div>
+          </div>
+    
+          <div class="container">
+            <!-- Example row of columns -->
+            <div class="row">
+              <div class="col-md-4">
+                <h2>Uses</h2>
+                <p> <ol>
+                    <li>Transferring data through the wires (messaging).</li>
+                    <li>A method of storing data (in databases, on hard disk drives)</li>
+                    <li>A method of remote procedure calls</li>
+                    <li>A method for distributing objects</li>
+                    <li>A method for detecting changes in time-varying data</li>
+                </ol>
+                    
+                </p>
+                <p><a class="btn btn-secondary" href="#" role="button">View details »</a></p>
+              </div>
+              <div class="col-md-4">
+                <h2>Drawbacks</h2>
+                <p>
+                    <ul class ="a">
+                            <li>Serialization breaks the opacity of an abstract data type by potentially exposing private implementation details.</li>
+                            <li>Trivial implementations which serialize all data members may violate encapsulation.</li>
+                            <li>To discourage competitors from making compatible products, publishers of proprietary software often keep the details of their programs' serialization formats a trade secret.</li>
+                            <li>Many institutions, such as archives and libraries, attempt to future proof their backup archives—in particular, database dumps—by storing them in some relatively human-readable serialized format.</li>
+                    </ul>
+                </p>
+                <p><a class="btn btn-secondary" href="#" role="button">View details »</a></p>
+              </div>
+              <div class="col-md-4">
+                <h2>Formats</h2>
+                <p>
+                    <ol class="d">
+                        <li> Xerox Network Systems Courier technology in the early 1980s influenced the first widely adopted standard</li>
+                        <li> Sun Microsystems published the External Data Representation (XDR) in 1987.</li>
+                        <li>In the late 1990s, a push to provide an alternative to the standard serialization protocols started: XML was used to produce a human readable text-based encoding. </li>
+                        <li>JSON is a lighter plain-text alternative to XML which is also commonly used for client-server communication in web applications. JSON is based on JavaScript syntax, but is supported in other programming languages as well.</li>
+                    </ol>
+                </p>
+                <p><a class="btn btn-secondary" href="#" role="button">View details »</a></p>
+              </div>
+            </div>
+    
+            <hr>
+    
+          </div> <!-- /container -->
+    
+        </main>
+    
+        <footer class="container">
+          <p>© Revature 2017-2018</p>
+        </footer>
+    
+        <!-- Bootstrap core JavaScript
+        ================================================== -->
+        <!-- Placed at the end of the document so the pages load faster -->
+        <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+        <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
+        <script src="../../assets/js/vendor/popper.min.js"></script>
+        <script src="../../dist/js/bootstrap.min.js"></script>
+        <script src="Serial.js"></script>
+    
+    </body>
+
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/Weeks3-4/assignments/Webpage/Serial.js b/Weeks3-4/assignments/Webpage/Serial.js
new file mode 100644
index 000000000..0c5b7aaa5
--- /dev/null
+++ b/Weeks3-4/assignments/Webpage/Serial.js
@@ -0,0 +1,14 @@
+window.onload =function(){
+
+    $('#LMButton').on('click',wiki);
+    function wiki(){
+        window.location.assign('https://en.wikipedia.org/wiki/Serialization#Serialization_formats');
+
+    }
+
+    $('#gSearch').on('click', google);
+    function google(){
+        window.location.assign('https://www.google.com');
+    }
+
+}
\ No newline at end of file
diff --git a/Weeks3-4/assignments/Webpage/cat.png b/Weeks3-4/assignments/Webpage/cat.png
new file mode 100644
index 000000000..c30f35083
Binary files /dev/null and b/Weeks3-4/assignments/Webpage/cat.png differ
diff --git a/Weeks3-4/assignments/Webpage/cerealized.jpeg b/Weeks3-4/assignments/Webpage/cerealized.jpeg
new file mode 100644
index 000000000..c31133a8e
Binary files /dev/null and b/Weeks3-4/assignments/Webpage/cerealized.jpeg differ
diff --git a/Weeks3-4/assignments/Webpage/one.jpg b/Weeks3-4/assignments/Webpage/one.jpg
new file mode 100644
index 000000000..624e1901a
Binary files /dev/null and b/Weeks3-4/assignments/Webpage/one.jpg differ
diff --git a/Weeks3-4/assignments/jsAssign.html b/Weeks3-4/assignments/jsAssign.html
new file mode 100644
index 000000000..209325c75
--- /dev/null
+++ b/Weeks3-4/assignments/jsAssign.html
@@ -0,0 +1,175 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Document</title>
+
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+
+    <style>
+
+       .bd-example-container-body {
+            height: 3rem;
+            margin-right: 4.5rem;
+            background-color: grey;
+            border-radius: .25rem;
+            justify-content: center;
+
+        }
+        #subString{
+          width: 30%;
+          align-content: center;
+        }
+
+
+    </style>
+
+</head>
+
+    <div class="jumbotron jumbotron-fluid">
+        <div class="container">
+          <h1 class="display-4">Darius Moomivand</h1>
+          <p class="lead">This is my html project page.</p>
+        </div>
+    </div>
+
+    
+    <h3>Problem: 1</h3>
+    <div class="container">
+            <div class="row">
+              <div class="col-sm">
+                    <input type="text" id="input" placeholder="input">
+                    <label for="input"></label>
+              </div>
+              <div class="col-sm">
+                    <button type="button" class="btn btn-primary" id='mybutton'>Calculate</button>              
+                </div>
+              <div class="col-sm">
+                    <div class="bd-example-container-body" id ="results"></div>
+              </div>
+            </div>
+          </div>
+
+          <h3>Problem: 2</h3>
+          <div class="container">
+                  <div class="row">
+                    <div class="col-sm">
+                            <div class="bd-example-container-body" id ="bubIn"></div>
+                    </div>
+                    <div class="col-sm">
+                          <button type="button" class="btn btn-primary" id='bubButton'>Calculate</button>              
+                      </div>
+                    <div class="col-sm">
+                          <div class="bd-example-container-body" id ="bubbleAns"></div>
+                    </div>
+                  </div>
+                </div>
+
+                <h3>Problem: 3</h3>
+                <div class="container">
+                        <div class="row">
+                          <div class="col-sm">
+                                  <div class="bd-example-container-body" id ="revIn"></div>
+                          </div>
+                          <div class="col-sm">
+                                <button type="button" class="btn btn-primary" id='revButton'>Calculate</button>              
+                            </div>
+                          <div class="col-sm">
+                                <div class="bd-example-container-body" id ="reverseAns"></div>
+                          </div>
+                        </div>
+                      </div>
+    
+                      <h3>Problem: 4</h3>
+                      <div class="container">
+                              <div class="row">
+                                <div class="col-sm">
+                                        <div class="bd-example-container-body" id ="factorIn"></div>
+                                </div>
+                                <div class="col-sm">
+                                      <button type="button" class="btn btn-primary" id='factButt'>Calculate</button>              
+                                  </div>
+                                <div class="col-sm">
+                                      <div class="bd-example-container-body" id ="factAns"></div>
+                                </div>
+                              </div>
+                            </div>
+
+                            <h3>Problem: 5</h3>
+                            <div class="container">
+                                    <div class="row">
+                                      <div class="col-sm">
+                                        <input type="text" id="subinput1" placeholder="String">
+                                      </div>
+                                      <div class="col-sm">
+                                        <input type="text" id="subinput2" placeholder="Length">
+                                      </div>
+                                      <div class="col-sm">
+                                        <input type="text" id="subinput3" placeholder="Offset">
+                                      </div>
+                                    </div>
+                                  </div>
+                                  <div class="bd-example-container-body" id ="theAnswer">
+                                  </div>
+                                  <div>
+                                    <button type="button" class="btn btn-primary" id='SubStringResult'>Find Substring</button>              
+                                  </div>
+                                  <h3>Problem: 6</h3>
+                                  <div class="container">
+                                          <div class="row">
+                                            <div class="col-sm">
+                                                  <input type="text" id="isEven" placeholder="IsEven?">
+                                                  <label for="input"></label>
+                                            </div>
+                                            <div class="col-sm">
+                                                  <button type="button" class="btn btn-primary" id='checkEven'>Calculate</button>              
+                                              </div>
+                                            <div class="col-sm">
+                                                  <div class="bd-example-container-body" id ="prob6Ans"></div>
+                                            </div>
+                                          </div>
+                                        </div>
+                                        <h3>Problem: 7</h3>
+                                        <div class="container">
+                                                <div class="row">
+                                                  <div class="col-sm">
+                                                        <input type="text" id="inboundString" placeholder="EnterAString">
+                                                        <label for="input"></label>
+                                                  </div>
+                                                  <div class="col-sm">
+                                                        <button type="button" class="btn btn-primary" id='pallindromeB'>Calculate</button>              
+                                                    </div>
+                                                  <div class="col-sm">
+                                                        <div class="bd-example-container-body" id ="IsPalinRes"></div>
+                                                  </div>
+                                                </div>
+                                              </div>
+
+                                              <h3>Problem: 8</h3>
+                                              <div class="container">
+                                                      <div class="row">
+                                                        <div class="col-sm">
+                                                          <input type="text" id="shapeIn1" placeholder="Square,Triangle,Diamond">
+                                                        </div>
+                                                        <div class="col-sm">
+                                                          <input type="text" id="shapeIn2" placeholder="Height(odd)">
+                                                        </div>
+                                                        <div class="col-sm">
+                                                          <input type="text" id="shapeIn3" placeholder="Character">
+                                                        </div>
+                                                      </div>
+                                                    </div>
+                                                    <div class="bd-example-container-body" id ="printShape">
+                                                    </div>
+                                                    <div>
+                                                      <button type="button" class="btn btn-primary" id='makeShape'>Make Shape</button>              
+                                                    </div>
+    
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+    <script src='jsAssign.js'></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/Weeks3-4/assignments/jsAssign.js b/Weeks3-4/assignments/jsAssign.js
new file mode 100644
index 000000000..5fb6fad50
--- /dev/null
+++ b/Weeks3-4/assignments/jsAssign.js
@@ -0,0 +1,163 @@
+window.onload =function(){
+
+    $('#mybutton').on('click',fib);
+    
+
+    function fib(){
+       let num = $("#input").val();
+       var a =1;
+       var b =0;
+       var temp;
+
+       while (num >= 0){
+           temp = a;
+           a = a + b;
+           b = temp;
+           num--;
+       }
+
+       $('#results').html(b);
+    }
+
+
+    $('#bubButton').on('click',bubble);
+
+    function bubble(){
+        var arr = [5, 4, 3, 2, 1];
+        $('#bubIn').html(arr);
+
+        for(let i = 0; i < arr.length; i++){
+            for(let j = 0; j < arr.length-1;j++){
+                if(arr[j]>arr[j+1]){
+                    let temp = arr[j+1];
+                    arr[j+1] = arr[j];
+                    arr[j] = temp;
+                }
+            }
+
+        }
+        $('#bubbleAns').html(arr);
+
+    }
+
+    $('#revButton').on('click',revString);
+
+    function revString(){
+        let myString = 'string';
+        $('#revIn').html(myString);
+
+        let reversed = "";    
+        for (var i = myString.length - 1; i >= 0; i--){        
+          reversed += myString[i];
+        }  
+
+        $('#reverseAns').html(reversed);
+    }
+
+    $('#factButt').on('click', factorial);
+    
+    function factorial(){
+        let num = 5;
+        let temp =1;
+        
+        $('#factorIn').html(num);
+        
+        for(let i = num; i >0; i--){
+            temp = temp * i;
+        }
+
+        $('#factAns').html(temp);
+
+    }
+
+    $('#SubStringResult').on('click', substring);
+
+    function substring(){
+        let Astring = $('#subinput1').val();
+        let oneInt = $('#subinput2').val();
+        let twoInt = $('#subinput3').val();
+
+        let Bstring = Astring.substring(oneInt, twoInt);
+        $('#theAnswer').html(Bstring);
+
+    }
+
+
+    $('#checkEven').on('click',isItEven);
+
+    function isItEven(){
+        let num = $("#isEven").val();
+    
+        if(num & 1){
+            $('#prob6Ans').html('Its ODD');
+        }else {
+            $('#prob6Ans').html('Its EVEN');
+        }
+
+     }
+
+     $('#pallindromeB').on('click', isPally);
+
+     function isPally(){
+         var newString = $('#inboundString').val();
+         var left = 0;
+         var right = newString.length-1;
+         while(left < right){
+             if(newString[left++] !== newString[right--]){
+                console.log('test');
+                $('#IsPalinRes').html('Not A Palindrome');
+                return;
+             }
+         }
+         $('#IsPalinRes').html('A Palindrome');
+
+    }
+
+
+    $('#makeShape').on('click', shapes);
+    function shapes(){
+        console.log('test');
+        let shape = $('#shapeIn1').val();
+        let height = $('#shapeIn2').val();
+        let character = $('#shapeIn3').val();
+
+        switch(shape){
+            case 'Square': 
+                        for(let i = 0; i < height;i++){
+                            for(let j = 0; j < height;j++){
+                                console.log(character);
+                            }
+                            console.log('\n');
+                        }
+                        break;
+            case 'Triangle': 
+                        for(let i = 0; i < height;i++){
+                            for(let j= 0;j<=i;j++){
+                                console.log(character);
+                            }
+                            console.log('\n');  
+                        }                      
+                        break;
+            case 'Diamond': 
+                        for(let i = 0; i < height;i++){
+                            for(let j= 0;j<=i;j++){
+                                console.log(character);
+                            }
+                            console.log('\n');  
+                        }     
+                        for(let i = height; i > 0;i--){
+                            for(let j= 1;j<=i;j++){
+                                console.log(character);
+                            }
+                            console.log('\n');  
+                        }    
+
+                        break;
+            default: 
+                        console.log("Invalid input");
+                        break;
+        }
+
+    }
+
+}
diff --git a/Weeks3-4/servlets/helloservlet/pom.xml b/Weeks3-4/servlets/helloservlet/pom.xml
new file mode 100644
index 000000000..0ffc131b0
--- /dev/null
+++ b/Weeks3-4/servlets/helloservlet/pom.xml
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.ed</groupId>
+  <artifactId>helloservlet</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>war</packaging>
+  <description>Intro to servlets</description>
+  
+  	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.9.0.pr4</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.9.0.pr4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+	</dependencies>
+  
+  
+</project>
\ No newline at end of file
diff --git a/Weeks3-4/servlets/helloservlet/src/main/resources/com/ex/servlet/HelloServlet.java b/Weeks3-4/servlets/helloservlet/src/main/resources/com/ex/servlet/HelloServlet.java
new file mode 100644
index 000000000..d2d765329
--- /dev/null
+++ b/Weeks3-4/servlets/helloservlet/src/main/resources/com/ex/servlet/HelloServlet.java
@@ -0,0 +1,27 @@
+package com.ex.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+
+public class HelloServlet extends GenericServlet {
+
+	/* (non-Javadoc)
+	 * @see javax.servlet.GenericServlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
+	 */
+	@Override
+	public void service(ServletRequest req, 
+			ServletResponse res) throws ServletException, IOException {
+		System.out.println("--- IN HELLOSERVLET service()");
+		
+		PrintWriter writer = res.getWriter();
+		writer.println("HELLO WORLD! WELCOME TO JAVA SERVLETS!");
+
+	}
+
+}
\ No newline at end of file
diff --git a/Weeks3-4/servlets/helloservlet/src/main/webapp/WEB-INF/web.xml b/Weeks3-4/servlets/helloservlet/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..7e997ca4f
--- /dev/null
+++ b/Weeks3-4/servlets/helloservlet/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+  <display-name>helloservlets</display-name>
+ 
+  <servlet>
+  	<servlet-name>HS</servlet-name>
+  	<servlet-class>com.ex.servlet.HelloServlet</servlet-class>
+  </servlet>
+  
+   <servlet-mapping>
+  	<servlet-name>HS</servlet-name>
+  	<url-pattern>/test</url-pattern>
+  </servlet-mapping>
+  
+
+ </web-app>
+  
\ No newline at end of file
diff --git a/Weeks3-4/servlets/servletdemo/pom.xml b/Weeks3-4/servlets/servletdemo/pom.xml
new file mode 100644
index 000000000..60de1a2cf
--- /dev/null
+++ b/Weeks3-4/servlets/servletdemo/pom.xml
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.ex</groupId>
+  <artifactId>servletdemo</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>war</packaging>
+  
+  
+  	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.9.0.pr4</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.9.0.pr4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+	</dependencies>
+  
+  
+</project>
\ No newline at end of file
diff --git a/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/pojos/User.java b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/pojos/User.java
new file mode 100644
index 000000000..88faeda5d
--- /dev/null
+++ b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/pojos/User.java
@@ -0,0 +1,32 @@
+package com.ex.pojos;
+
+public class User {
+	
+	private String username;
+	private String password;
+	public User() {}
+	public User(String username, String password) {
+		super();
+		this.username = username;
+		this.password = password;
+	}
+	public String getUsername() {
+		return username;
+	}
+	public void setUsername(String username) {
+		this.username = username;
+	}
+	public String getPassword() {
+		return password;
+	}
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	@Override
+	public String toString() {
+		return "User [username=" + username + ", password=" + password + "]";
+	}
+	
+	
+
+}
diff --git a/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/service/DummyUserService.java b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/service/DummyUserService.java
new file mode 100644
index 000000000..a77923be1
--- /dev/null
+++ b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/service/DummyUserService.java
@@ -0,0 +1,31 @@
+package com.ex.service;
+
+import java.util.ArrayList;
+
+import com.ex.pojos.User;
+
+
+public class DummyUserService {
+
+	public DummyUserService() {
+		// TODO Auto-generated constructor stub
+	}
+	
+	static ArrayList<User> users = new ArrayList<User>();
+	{
+		users.add(new User("Darius", "none"));
+		users.add(new User("testuser", "123"));
+		users.add(new User("Jane", "abc"));
+	}
+	
+	public ArrayList<User> getUsers(){
+		return users;
+	}
+	
+	//STREAM MAGIC
+	public User getByUsername(String name) {
+		User u = users.stream().filter( x -> 
+		x.getUsername().equals(name)).findAny().orElse(null);
+		return u;
+	}
+}
diff --git a/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/HelloHttpServlet.java b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/HelloHttpServlet.java
new file mode 100644
index 000000000..01f56c96c
--- /dev/null
+++ b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/HelloHttpServlet.java
@@ -0,0 +1,65 @@
+package com.ex.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class HelloHttpServlet extends HttpServlet{
+	
+	@Override
+	public void init() throws ServletException {
+		// TODO Auto-generated method stub
+		super.init();
+		System.out.println("IN HTTP SERLVET INIT");
+	}
+	
+	@Override
+	public void destroy() {
+		// TODO Auto-generated method stub
+		super.destroy();
+		System.out.println("IN HTTP DESTROY");
+	}
+	
+	
+	@Override
+	protected void doGet(HttpServletRequest req, 
+			HttpServletResponse resp) 
+					throws ServletException, IOException {
+		System.out.println("IN HTTP SERVLET DOGET");
+		PrintWriter out = resp.getWriter();
+		resp.setContentType("text/html");
+		
+		//Servlet Config is any configuration detail about this particular servlet
+		String info = getServletConfig().getInitParameter("info");
+		out.write("<h1> Hello <b>Genesis</b> ! </h1>"
+				+ "<br> Random init params: <i>" + info + "</i>");
+	}
+	
+	@Override
+	protected void doPost(HttpServletRequest req, 
+			HttpServletResponse resp) 
+					throws ServletException, IOException {
+		
+		
+		PrintWriter out = resp.getWriter();
+		out.write("IN HTTPSERVLET POST METHOD!");
+	}
+	
+	@Override
+	protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		// TODO Auto-generated method stub
+		super.doPut(req, resp);
+	}
+
+	@Override
+	protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		// TODO Auto-generated method stub
+		super.doDelete(req, resp);
+	}
+	
+	
+}
diff --git a/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/HelloServlet.java b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/HelloServlet.java
new file mode 100644
index 000000000..655e8d249
--- /dev/null
+++ b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/HelloServlet.java
@@ -0,0 +1,65 @@
+package com.ex.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+
+public class HelloServlet extends GenericServlet {
+	
+	static int counter = 0;
+	/*
+		LIFECYCLE OF A SERVLET! init() service() destroy()
+		init is called by the container when the servlet is 
+		initialized. here you can configure things like 
+		parameters, loggers, etc. basically anything you want
+		to happen upon initialization of this servlet
+		
+		the container then calls the service() method every 
+		time a request is sent to the url-pattern that you have
+		assigned this servlet. basically this is the part
+		where the servlet "services" the request
+		
+		lastly, the container calls destroy which will deallocate
+		memory to the servlet. we often don't see this happen bc
+		we don't typically limit the lifetime of the servlet, 
+		and if we simply stop the app from running, this method 
+		call is not shown
+	 */
+	@Override
+	public void init() throws ServletException {
+		// TODO Auto-generated method stub
+		super.init();
+		System.out.println("INITIALIZING HELLO SERVLET");
+	}
+
+	/* (non-Javadoc)
+	 * @see javax.servlet.GenericServlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
+	 */
+	@Override
+	public void service(ServletRequest req, 
+			ServletResponse res) throws ServletException, IOException {
+		
+		System.out.println("--- IN HELLOSERVLET service() -- count: " + counter);
+		
+		PrintWriter writer = res.getWriter();
+		
+		//SERVLET CONTEXT is any config details applying to the entire servlet container
+		String bio = getServletContext().getInitParameter("Bio");
+		
+		writer.println("HELLO WORLD! WELCOME TO JAVA SERVLETS!"
+				+ "About me: " + bio);
+
+	}
+	
+	@Override
+	public void destroy() {
+		super.destroy();
+		System.out.println("IN HELLOSERVLET destroy()");
+	}
+
+}
\ No newline at end of file
diff --git a/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/HomeServlet.java b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/HomeServlet.java
new file mode 100644
index 000000000..a1d5cbee8
--- /dev/null
+++ b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/HomeServlet.java
@@ -0,0 +1,65 @@
+package com.ex.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import com.ex.pojos.User;
+
+
+@WebServlet("/home")
+public class HomeServlet extends HttpServlet {
+	
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		// TODO Auto-generated method stub
+		HttpSession session= req.getSession();
+		
+		User u = (User) session.getAttribute("ser");
+		if(u == null) {
+			resp.sendRedirect("login");
+		}
+		else {
+			PrintWriter out = resp.getWriter();
+			resp.setContentType("text/html");
+			String html ="<!DOCTYPE html>\n" + 
+					"<html>\n" + 
+					"<head>\n" + 
+					"<meta charset=\"UTF-8\">\n" + 
+					"<title>Insert title here</title>\n" + 
+					"\n" + 
+					"\n" + 
+					"<script src=\"https://code.jquery.com/jquery-3.3.1.slim.min.js\" integrity=\"sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo\" crossorigin=\"anonymous\"></script>\n" + 
+					"<script src=\"https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js\" integrity=\"sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49\" crossorigin=\"anonymous\"></script>\n" + 
+					"<script src=\"https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js\" integrity=\"sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy\" crossorigin=\"anonymous\"></script>\n" + 
+					"\n" + 
+					"<link rel=\"stylesheet\" href=\"https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css\" integrity=\"sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO\" crossorigin=\"anonymous\">\n" + 
+					"\n" + 
+					"\n" + 
+					"</head>\n" + 
+					"<body>\n" + 
+					"\n" + 
+					"<div class=\"jumbotron\">\n" + 
+					"	<h1><i>Welcome, " + u.getUsername() + "</i></h1>\n" + 
+					"	<br>\n" + 
+					"	<form method=\"post\" \"login\">\n" + 
+					"		<input type=\"text\" name=\"username\" class=\"form-control\">\n" + 
+					"		<input type=\"password\" name=\"password\" class=\"form-control\">\n" + 
+					"		<input type=\"submit\" value=\"Go!\">\n" + 
+					"	\n" + 
+					"	</form>\n" + 
+					"	\n" + 
+					"</div>\n" + 
+					"\n" + 
+					"\n" + 
+					"</body>\n" + 
+					"</html>";
+			}
+	}
+
+}
diff --git a/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/LoginServlet.java b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/LoginServlet.java
new file mode 100644
index 000000000..9bed1afd1
--- /dev/null
+++ b/Weeks3-4/servlets/servletdemo/src/main/java/com/ex/servlets/LoginServlet.java
@@ -0,0 +1,66 @@
+package com.ex.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import com.ex.pojos.User;
+import com.ex.service.DummyUserService;
+
+
+
+@WebServlet("/login")
+public class LoginServlet extends HttpServlet{
+	
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		//REQUEST DISPATCHER! Used for forwarding
+		req.getRequestDispatcher("login.html").
+		forward(req, resp);
+	}
+	
+	
+	static DummyUserService uService = new DummyUserService();
+	
+	@Override
+	protected void doPost(HttpServletRequest req,
+			HttpServletResponse resp) 
+					throws ServletException, IOException {
+		//functionality to get info from login form 
+		
+		String name = req.getParameter("username");
+		String pass = req.getParameter("password");
+		
+		System.out.println("LOGGING IN USER " + name  + ":" + pass);
+		
+		User u = uService.getByUsername(name);
+		
+		PrintWriter out = resp.getWriter();
+		if(u == null) {
+			//out.println("Sorry, invalid username");
+			resp.sendRedirect("login");
+		}
+		else if(!u.getPassword().equals(pass)) {
+			out.println("Sorry, invalid passsword");
+		}
+		else {
+			//valid login getSession() - returns 
+			//current session or creates new one if none exists
+			HttpSession session = req.getSession();
+			session.setAttribute("user", u);
+			System.out.println(session.getId());
+			//out.println("Welcome, " + name + "!");
+			resp.sendRedirect("home");
+		}
+	
+	
+	}
+	
+
+}
\ No newline at end of file
diff --git a/Weeks3-4/servlets/servletdemo/src/main/webapp/WEB-INF/web.xml b/Weeks3-4/servlets/servletdemo/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..b8f8d64c8
--- /dev/null
+++ b/Weeks3-4/servlets/servletdemo/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+  <display-name>servletdemo</display-name>
+  
+  
+  <context-param>
+  	<param-name>Bio</param-name>
+  	<param-value>Darius is cool</param-value>
+  </context-param>
+  
+<servlet>
+  	<servlet-name>HS</servlet-name>
+  	<servlet-class>com.ex.servlets.HelloServlet</servlet-class>
+  	<load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+  	<servlet-name>HS</servlet-name>
+  	<url-pattern>/test</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+  	<servlet-name>HelloHttp</servlet-name>
+  	<servlet-class>com.ex.servlets.HelloHttpServlet</servlet-class>
+  	<init-param>
+  		<param-name>info</param-name>
+  		<param-value>Servlets are awesome</param-value>
+  	</init-param>
+  	<load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet-mapping>
+  	<servlet-name>HelloHttp</servlet-name>
+  	<url-pattern>/hellohttp</url-pattern>
+  </servlet-mapping>
+  
+</web-app>
\ No newline at end of file
diff --git a/Weeks3-4/servlets/servletdemo/src/main/webapp/login.html b/Weeks3-4/servlets/servletdemo/src/main/webapp/login.html
new file mode 100644
index 000000000..387c48ed5
--- /dev/null
+++ b/Weeks3-4/servlets/servletdemo/src/main/webapp/login.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Exporing Servlets</title>
+
+
+<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+
+
+</head>
+<body>
+
+<div class="jumbotron">
+	<h1>Login Page</h1>
+	<br>
+	<form method="post" action="login">
+		<input type="text" name="username" class="form-control">
+		<input type="password" name="password" class="form-control">
+		<input type="submit" value="Go!">
+	
+	</form>
+	
+</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/stringtest/pom.xml b/stringtest/pom.xml
new file mode 100644
index 000000000..94685c0c0
--- /dev/null
+++ b/stringtest/pom.xml
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.ex</groupId>
+  <artifactId>stringtest</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <name>springtester</name>
+  
+  
+	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>io.spring.platform</groupId>
+				<artifactId>platform-bom</artifactId>
+				<version>2.0.3.RELEASE</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.springframework/spring-core -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+		</dependency>
+
+	</dependencies>
+  
+</project>
\ No newline at end of file
diff --git a/stringtest/src/main/java/com/ex/autowire/App.java b/stringtest/src/main/java/com/ex/autowire/App.java
new file mode 100644
index 000000000..4cbf90894
--- /dev/null
+++ b/stringtest/src/main/java/com/ex/autowire/App.java
@@ -0,0 +1,23 @@
+package com.ex.autowire;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class App {
+
+	public static void main(String[] args) {
+		ApplicationContext context = new ClassPathXmlApplicationContext("beans.xml");
+		
+		Employee me = (Employee) context.getBean("employee");
+		
+		me.getDepartment().setName("Training Team");
+		
+		Department dept = (Department) context.getBean("department");
+		
+		System.out.println(dept.getName());
+	}
+
+	
+	
+	
+}
diff --git a/stringtest/src/main/java/com/ex/autowire/Department.java b/stringtest/src/main/java/com/ex/autowire/Department.java
new file mode 100644
index 000000000..821076b39
--- /dev/null
+++ b/stringtest/src/main/java/com/ex/autowire/Department.java
@@ -0,0 +1,29 @@
+package com.ex.autowire;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope("prototype")
+public class Department {
+	
+	String name;
+	
+	public Department() {}
+
+
+	public Department(String name) {
+		super();
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+
+}
diff --git a/stringtest/src/main/java/com/ex/autowire/Employee.java b/stringtest/src/main/java/com/ex/autowire/Employee.java
new file mode 100644
index 000000000..fa110690d
--- /dev/null
+++ b/stringtest/src/main/java/com/ex/autowire/Employee.java
@@ -0,0 +1,49 @@
+package com.ex.autowire;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope("prototype")
+public class Employee {
+
+	private String name;
+	private double salary;
+	private Department department;
+	
+	@Autowired
+	public Employee() {}
+
+	public Employee(String name) {}
+
+	
+	
+	public Employee(String name, double salary, Department department) {
+		super();
+		this.name = name;
+		this.salary = salary;
+		this.department = department;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public double getSalary() {
+		return salary;
+	}
+	public void setSalary(double salary) {
+		this.salary = salary;
+	}
+	public Department getDepartment() {
+		return department;
+	}
+	public void setDepartment(Department department) {
+		this.department = department;
+	}
+	
+	
+	
+}
diff --git a/stringtest/src/main/java/com/ex/hellospring/DependentBean.java b/stringtest/src/main/java/com/ex/hellospring/DependentBean.java
new file mode 100644
index 000000000..527c7e84f
--- /dev/null
+++ b/stringtest/src/main/java/com/ex/hellospring/DependentBean.java
@@ -0,0 +1,23 @@
+package com.ex.hellospring;
+
+public class DependentBean {
+	private helloWorld hello;
+
+	public DependentBean() {}
+	
+	public DependentBean(helloWorld hello) {
+		super();
+		this.hello = hello;
+	}
+
+	public helloWorld getHello() {
+		return hello;
+	}
+
+	public void setHello(helloWorld hello) {
+		this.hello = hello;
+	}
+	
+	
+
+}
diff --git a/stringtest/src/main/java/com/ex/hellospring/app.java b/stringtest/src/main/java/com/ex/hellospring/app.java
new file mode 100644
index 000000000..4197a90b5
--- /dev/null
+++ b/stringtest/src/main/java/com/ex/hellospring/app.java
@@ -0,0 +1,26 @@
+package com.ex.hellospring;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class app {
+
+	public static void main(String[] args) {
+		
+		// Wrong
+		helloWorld hello =new helloWorld();
+		System.out.println(hello.getMessage());
+		
+		ApplicationContext context = new ClassPathXmlApplicationContext("beans.xml");
+		
+		helloWorld world = (helloWorld) context.getBean("thisIsABean");
+		System.out.println(world.getMessage());
+		
+		world.setMessage("Hello I changed");
+		System.out.println(world.getMessage());
+		
+
+		DependentBean d = (DependentBean) context.getBean("dependent");
+		System.out.println(d.getHello().getMessage());
+	}
+}
diff --git a/stringtest/src/main/java/com/ex/hellospring/helloWorld.java b/stringtest/src/main/java/com/ex/hellospring/helloWorld.java
new file mode 100644
index 000000000..46ee6ab65
--- /dev/null
+++ b/stringtest/src/main/java/com/ex/hellospring/helloWorld.java
@@ -0,0 +1,30 @@
+package com.ex.hellospring;
+
+public class helloWorld {
+
+	private String message;
+
+	
+	public helloWorld() {
+		
+		System.out.println("in no arg constructor");
+		
+	}
+	
+	public helloWorld(String message) {
+		super();
+		this.message = message;
+		System.out.println("in args constructor");
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+		System.out.println("in sMessage ");
+	}
+	
+	
+}
diff --git a/stringtest/src/main/java/com/ex/lifecycle/App.java b/stringtest/src/main/java/com/ex/lifecycle/App.java
new file mode 100644
index 000000000..0e98e56da
--- /dev/null
+++ b/stringtest/src/main/java/com/ex/lifecycle/App.java
@@ -0,0 +1,19 @@
+package com.ex.lifecycle;
+
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class App {
+	
+	public static void main(String[] args) {
+		AbstractApplicationContext context = new ClassPathXmlApplicationContext("beans.xml");
+		
+		Life life = (Life) context.getBean("life");
+		
+		life.live();
+		context.close();
+		
+		
+	}
+
+}
diff --git a/stringtest/src/main/java/com/ex/lifecycle/Life.java b/stringtest/src/main/java/com/ex/lifecycle/Life.java
new file mode 100644
index 000000000..bdb398893
--- /dev/null
+++ b/stringtest/src/main/java/com/ex/lifecycle/Life.java
@@ -0,0 +1,100 @@
+package com.ex.lifecycle;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+public class Life implements InitializingBean, DisposableBean, BeanFactoryAware, 
+	BeanPostProcessor, BeanNameAware, ApplicationContextAware {
+	/*
+	 * Spring Bean Lifecycle
+	 */
+
+	private String circlOfLife;
+	
+	public Life() {
+		System.out.println("In no arg constructor for life");
+		
+	}
+
+	public Life(String circlOfLife) {
+		super();
+		this.circlOfLife = circlOfLife;
+	}
+
+	public String getCirclOfLife() {
+		return circlOfLife;
+	}
+
+	public void setCirclOfLife(String circlOfLife) {
+		this.circlOfLife = circlOfLife;
+	}
+	
+	public void live() {
+		System.out.println("Lets Live");
+	}
+	
+	public void customInit() {
+		System.out.println("im init");
+	}
+	
+	public void customDestroyMethod() {
+		System.out.println("Im destroying");
+	}
+
+
+
+	@Override
+	public void setBeanName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		System.out.println("this is my Application context call");
+		
+		
+	}
+	
+	@Override
+	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+		System.out.println("This is my Process BEFORE Initialization");
+		
+		
+		return null;
+	}
+
+	@Override
+	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+		System.out.println("This is my process AFTER Initialization");
+		
+		
+		return null;
+	}
+
+	@Override
+	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+		System.out.println("This is my method call to setBeanFactory");
+		
+	}
+
+	@Override
+	public void destroy() throws Exception {
+		System.out.println("This is my method call to destroy my Bean");
+		
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		System.out.println("This is my method call to after Properties set.");
+		
+	}
+
+}
diff --git a/stringtest/src/test/resources/beans.xml b/stringtest/src/test/resources/beans.xml
new file mode 100644
index 000000000..debc16abb
--- /dev/null
+++ b/stringtest/src/test/resources/beans.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd">
+
+
+	<bean id="thisIsABean" class="com.ex.hellospring.helloWorld" scope="prototype">
+	
+		<property name ="message" value="welcome to spring this is dep injection"/>
+		
+		<constructor-arg name ="message" value="welcome to spring this is Constructor injection">
+		</constructor-arg>
+		
+	</bean>
+
+	<bean id="dependent" class="com.ex.hellospring.DependentBean">
+		<property name="hello" ref="thisIsABean"></property>
+	</bean>
+
+
+<!--  commented out for annotation example
+	<bean id="employee" class="com.ex.autowire.Employee" autowire="byName">
+		<constructor-arg name ="message" value="gen" ></constructor-arg>
+	
+		<property name="salary" value="100000"></property>
+	</bean>
+
+	<bean id="department" class="com.ex.autowire.Department"></bean>
+-->
+
+	<bean id="life" class ="com.ex.lifecycle.Life"
+		init-method="customInit" " destroy-method="customDestroyMethod">
+		<property name="circlOfLife" value="hakuna matata!"></property>
+	</bean>
+
+
+	<context:annotation-config></context:annotation-config>
+	<context:component-scan base-package="com.ex"></context:component-scan>
+
+</beans>
+