diff --git a/.classpath b/.classpath
index 1d1a999..c29b817 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/*.java" including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
diff --git a/.project b/.project
index ef749d4..07eddde 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>PCF-demo</name>
+	<name>PCF-demo_PHD</name>
 	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
 	<projects>
 	</projects>
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index e31048b..fe743ec 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,7 +5,7 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <property name="context-root" value="xd-demo-client"/>
         <property name="java-output-path" value="/xd-demo-client/target/classes"/>
+        <property name="context-root" value="pcfdemo"/>
     </wb-module>
 </project-modules>
diff --git a/README.md b/README.md
index c51c081..6cbf334 100755
--- a/README.md
+++ b/README.md
@@ -6,3 +6,5 @@ Notice it will alert no RabbitMQ service is bound.. the link "Stream Data" will
 
 Now, bind a RabbitMQ service. Re-push the app.
 Click "Stream Data" and see the fun start. Click on a state to detail orders going throw it.
+
+Additional fun: click "Kill App" and watch the application crashing.. it will show as "crashed" when you visualize events (cf events <app_name>). Health manager will automatically restart the app for you. => makes a good demo, too.
diff --git a/manifest.yml b/manifest.yml
index 048cdfd..4d59973 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,9 +1,11 @@
 ---
 applications:
 - name: pcfdemo
-  memory: 512M 
+  memory: 1G 
   instances: 1
-  host: pcfdemo
+  host: pcfdemophd
   path: ./target/pcfdemo.war
   services:
-    - rabbit
+    - phd-service
+    - rabbit-service
+
diff --git a/pom.xml b/pom.xml
index 57b1811..5475ec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,7 @@
 			<name>Springframework Maven Repository</name>
 			<url>http://repo.springsource.org/milestone</url>
 		</repository>
+
 	</repositories>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -25,7 +26,15 @@
 	<dependencies>
 
 
-
+	<dependency>
+	      <groupId>GemFireXD-client</groupId>  
+	       <artifactId>com.pivotal</artifactId>  
+	       <version>1.0</version> 
+	      <scope>system</scope>
+		  <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/gemfirexd-1.0.6.jar</systemPath>
+	</dependency>
+		
+		
       <dependency>
           <groupId>org.springframework.amqp</groupId>
           <artifactId>spring-rabbit</artifactId>
@@ -56,18 +65,61 @@
 			<version>${org.springframework-version}</version>
 		</dependency>
 		
+		<!--  jdbc -->
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+			<version>${org.springframework-version}</version>
+		</dependency>		
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<version>9.3-1100-jdbc3</version>
+		</dependency>
+				
+		<!-- cloud -->		
 		<dependency>
 		    <groupId>org.springframework.cloud</groupId>
-		    <artifactId>spring-service-connector</artifactId>
-		    <version>0.9.2</version>
+		    <artifactId>spring-cloud-spring-service-connector</artifactId>
+		    <version>1.1.1.BUILD-SNAPSHOT</version>
 		</dependency>
-		<!-- If you intend to deploy the app on Cloud Foundry, add the following -->
 		<dependency>
 		    <groupId>org.springframework.cloud</groupId>
-		    <artifactId>cloudfoundry-connector</artifactId>
-		    <version>0.9.2</version>
-		</dependency>		
+		    <artifactId>spring-cloud-cloudfoundry-connector</artifactId>
+		    <version>1.1.1.BUILD-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.springframework.cloud</groupId>
+		    <artifactId>spring-cloud-pcf-connector</artifactId>
+		    <version>1.1.1.BUILD-SNAPSHOT</version>
+		</dependency>
+		
+		<dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib</artifactId>
+            <version>2.2.2</version>
+        </dependency>
 		
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-common</artifactId>
+			<version>2.2.0</version>
+			<exclusions>
+				  <exclusion>
+				  	<groupId>tomcat</groupId>
+				  	<artifactId>jasper-compiler</artifactId>
+				  </exclusion>
+				  <exclusion>
+				  	<groupId>tomcat</groupId>
+				  	<artifactId>jasper-runtime</artifactId>
+				  </exclusion>
+			</exclusions>
+		</dependency>		
 		<!-- 
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -163,6 +215,11 @@
 			<artifactId>jackson-mapper-asl</artifactId>
 			<version>1.9.13</version>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-core-asl</artifactId>
+			<version>1.9.13</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.data</groupId>
diff --git a/src/main/java/com/pivotal/example/xd/BootstrapDataPopulator.java b/src/main/java/com/pivotal/example/xd/BootstrapDataPopulator.java
index 4dc7c71..8973e98 100644
--- a/src/main/java/com/pivotal/example/xd/BootstrapDataPopulator.java
+++ b/src/main/java/com/pivotal/example/xd/BootstrapDataPopulator.java
@@ -1,25 +1,130 @@
 package com.pivotal.example.xd;
 
-import java.util.logging.Logger;
+import java.sql.Connection;
+import java.sql.ResultSet;
 
+import javax.sql.DataSource;
+
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-@Service
+@Service 
 public class BootstrapDataPopulator implements InitializingBean {
 
-    private final Logger LOG = Logger.getLogger(BootstrapDataPopulator.class.getName());
-
-
+	@Autowired @Qualifier("hawqDataSource") DataSource hawqDataSource;
+	@Autowired @Qualifier("gemfirexdDataSource") DataSource gemfirexdDataSource;
+	@Autowired org.apache.hadoop.conf.Configuration hadoopConfiguration;
+	
+	static Logger logger = Logger.getLogger(BootstrapDataPopulator.class);
+	
+	String gemXDURI = null;
+	String gemXDUser = null;
+	String gemXDPass = null;
+	String nameNode= null;
+	String dir = null;
+		
+	//@Autowired 
+	//private ApplicationContext applicationContext;	
+	
+	public static final String CREATE_DISK_STORE_DDL="" +
+			" CREATE HDFSSTORE streamingstore " +
+			" NameNode '_NAMENODE_' " +
+			" HomeDir '/user/gfxd/' " + 
+			" BatchSize 10 "+
+			" QueuePersistent true "+
+			" MaxWriteOnlyFileSize 200;";
+			
+	public static final String CREATE_TABLE_DDL="" +
+			" CREATE TABLE ORDERS " +
+			" (ORDER_ID INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, " +
+			"  STATE VARCHAR(2) NOT NULL, " +
+			"  VALUE INT NOT NULL ) " +
+			" PARTITION BY PRIMARY KEY " +
+			//" EXPIRE ENTRY WITH TIMETOLIVE 300 ACTION DESTROY "+
+			" HDFSSTORE (streamingstore) WRITEONLY;" ; 
+	
+	public static final String INSERT_ORDER="" +
+			" INSERT INTO ORDERS (STATE, VALUE) VALUES (?,?);" ; 
+	
+	public static final String SELECT_ORDER="" +
+			" select STATE,sum(VALUE) AS \"SUM\" from orders group by STATE" ; 	
+	
+	public static final String CREATE_HAWQ_TABLE_DDL="" +
+			" CREATE TABLE customers " +
+			"( " +
+			"customer_id TEXT," +
+			"first_name TEXT," +
+			"last_name TEXT," +
+			"gender TEXT" +
+			") " +
+			"WITH (appendonly=true, compresstype=quicklz) DISTRIBUTED RANDOMLY;" ;
+	
+	public static final String INSERT_CUSTOMER="" +
+			" INSERT INTO CUSTOMERS (customer_id, first_name, last_name, gender) VALUES (?,?,?,?);" ;
+	
+	public static final String SELECT_CUSTOMER_LNAME="" +
+			"SELECT * FROM CUSTOMERS WHERE LAST_NAME=(?);";
+	
+	public static final String SELECT_CUSTOMERS="" +
+			"SELECT * FROM CUSTOMERS;";
+	
+    @Transactional
     @Override
-    @Transactional()
     public void afterPropertiesSet() throws Exception {
-        LOG.info("Bootstrapping data...");
-
-        // Create DB table
-
-        LOG.info("...Bootstrapping completed");
+        logger.warn("Bootstrapping data...");
+ 
+        Connection conn = gemfirexdDataSource.getConnection(); 
+        nameNode = hadoopConfiguration.get("fs.defaultFS").toString();
+        // Create HDFS Disk Store if not existing.        
+        try{
+        	String ddl = CREATE_DISK_STORE_DDL.replaceAll("_NAMENODE_", nameNode);
+        	logger.warn("EXECUTING DDL: "+ddl);
+	        conn.createStatement().executeUpdate(ddl);
+	        logger.warn("CREATED DISK STORE");
+        }
+        catch(Exception e){
+        	logger.fatal("Exception trying to create hdfs disk store. Maybe it already exists?",e);
+        }
+        
+        // check if table already exists
+        java.sql.DatabaseMetaData metadata = conn.getMetaData();
+       
+        ResultSet rs = metadata.getTables(null, null, "ORDERS", null);
+        if (rs.next()){
+        	logger.warn("ORDERS TABLE ALREADY EXISTS.. SKIPPING CREATION. ");	        
+        }
+        else{
+	        try{
+		        String ddl = CREATE_TABLE_DDL;
+	        	logger.warn("EXECUTING DDL: "+ddl);
+		        conn.createStatement().executeUpdate(ddl);
+		        logger.warn("CREATED TABLE");
+		        conn.commit();
+	        }
+	        catch(Exception e){
+	        	logger.fatal("Exception trying to create table", e);
+	        	//e.printStackTrace();
+	        }
+        }
+    	conn.close();
+    	//Creating a HAWQ Table
+    	conn = hawqDataSource.getConnection();
+    	try {
+    		String ddl = CREATE_HAWQ_TABLE_DDL;
+        	logger.warn("EXECUTING DDL: "+ddl);
+	        conn.createStatement().executeUpdate(ddl);
+	        logger.warn("CREATED TABLE");
+	        
+    		
+    	} catch (Exception e) {
+    		logger.error("Error creating HAWQ table", e);
+    	}
+    		
+        logger.warn("...Bootstrapping completed");
     }
 
    
diff --git a/src/main/java/com/pivotal/example/xd/CloudConfig.java b/src/main/java/com/pivotal/example/xd/CloudConfig.java
new file mode 100644
index 0000000..e788773
--- /dev/null
+++ b/src/main/java/com/pivotal/example/xd/CloudConfig.java
@@ -0,0 +1,33 @@
+package com.pivotal.example.xd;
+
+import javax.sql.DataSource;
+
+import org.apache.hadoop.conf.Configuration;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.cloud.config.java.AbstractCloudConfig;
+import org.springframework.context.annotation.Bean;
+
+@org.springframework.context.annotation.Configuration
+public class CloudConfig extends AbstractCloudConfig {
+
+	@Bean
+	public ConnectionFactory rabbitConnectionFactory() {
+		return connectionFactory().rabbitConnectionFactory();
+	}
+	
+	@Bean
+	public DataSource hawqDataSource() {
+		return connectionFactory().dataSource("phd-service/hawq");
+	}
+
+	@Bean
+	public DataSource gemfirexdDataSource() {
+		return connectionFactory().dataSource("phd-service/gemfirexd");
+	}
+	
+	@Bean
+	public Configuration hadoopConfiguration() {
+		return connectionFactory().service(Configuration.class);
+	}
+
+}
diff --git a/src/main/java/com/pivotal/example/xd/Customer.java b/src/main/java/com/pivotal/example/xd/Customer.java
new file mode 100644
index 0000000..881d276
--- /dev/null
+++ b/src/main/java/com/pivotal/example/xd/Customer.java
@@ -0,0 +1,110 @@
+package com.pivotal.example.xd;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+public class Customer implements Serializable { 
+	private String fName;
+	private String lName;
+	private String gender;
+	private int id;
+	
+	public Customer(String fName, String lName, String gender, int id) {
+		this.setfName(fName);
+		this.setlName(lName);
+		this.setGender(gender);
+		this.setId(id);
+	}
+	/**
+	 * @return the fName
+	 */
+	public String getfName() {
+		return fName;
+	}
+	/**
+	 * @return the lName
+	 */
+	public String getlName() {
+		return lName;
+	}
+	/**
+	 * @return the gender
+	 */
+	public String getGender() {
+		return gender;
+	}
+	/**
+	 * @return the id
+	 */
+	public int getId() {
+		return id;
+	}
+	/**
+	 * @param id the id to set
+	 */
+	public void setId(int id) {
+		this.id = id;
+	}
+	/**
+	 * @param gender the gender to set
+	 */
+	public void setGender(String gender) {
+		this.gender = gender;
+	}
+	/**
+	 * @param lName the lName to set
+	 */
+	public void setlName(String lName) {
+		this.lName = lName;
+	}
+	/**
+	 * @param fName the fName to set
+	 */
+	public void setfName(String fName) {
+		this.fName = fName;
+	}
+
+	
+	   public byte[] toBytes() {
+	        byte[]bytes;
+	        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+	        try{
+	            ObjectOutputStream oos = new ObjectOutputStream(baos);
+	            oos.writeObject(this);
+	            oos.flush();
+	            oos.reset();
+	            bytes = baos.toByteArray();
+	            oos.close();
+	            baos.close();
+	        } catch(IOException e){
+	            throw new RuntimeException(e);
+	        }
+	        return bytes;
+	    }
+
+	    public static Customer fromBytes(byte[] body) {
+	        Customer obj = null;
+	        try {
+	            ByteArrayInputStream bis = new ByteArrayInputStream(body);
+	            ObjectInputStream ois = new ObjectInputStream(bis);
+	            obj = (Customer) ois.readObject();
+	            ois.close();
+	            bis.close();
+	        }
+	        catch (IOException e) {
+	            e.printStackTrace();
+	        }
+	        catch (ClassNotFoundException ex) {
+	            ex.printStackTrace();
+	        }
+	        return obj;
+	    }
+	    @Override
+	    public String toString() {
+	    	return this.id + "," + this.fName + "," + this.lName + "," + this.gender + "\n";
+	    }
+}
diff --git a/src/main/java/com/pivotal/example/xd/OrderConsumer.java b/src/main/java/com/pivotal/example/xd/OrderConsumer.java
index 2c5b45c..ded7501 100644
--- a/src/main/java/com/pivotal/example/xd/OrderConsumer.java
+++ b/src/main/java/com/pivotal/example/xd/OrderConsumer.java
@@ -1,20 +1,26 @@
 package com.pivotal.example.xd;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.pivotal.example.xd.controller.OrderController;
 import com.rabbitmq.client.QueueingConsumer;
 
+@Component
 public class OrderConsumer implements Runnable {
 
+	@Autowired OrderController orderController;
+	@Autowired RabbitClient rabbitClient;
+	
 	@Override
 	public void run() {
 
-		RabbitClient client = RabbitClient.getInstance();
 		try{
-			QueueingConsumer consumer = client.consumeOrders();
+			QueueingConsumer consumer = rabbitClient.consumeOrders();
 			while (true){
 		      QueueingConsumer.Delivery delivery = consumer.nextDelivery();
 		      Order order = Order.fromBytes(delivery.getBody());
-		      OrderController.registerOrder(order);
+		      orderController.registerOrder(order);
 			}
 			
 		}
diff --git a/src/main/java/com/pivotal/example/xd/OrderGenerator.java b/src/main/java/com/pivotal/example/xd/OrderGenerator.java
index 715ddea..281e8af 100644
--- a/src/main/java/com/pivotal/example/xd/OrderGenerator.java
+++ b/src/main/java/com/pivotal/example/xd/OrderGenerator.java
@@ -3,8 +3,14 @@
 import java.io.IOException;
 import java.util.Random;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
 public class OrderGenerator implements Runnable {
 
+	@Autowired RabbitClient rabbitClient;
+	
 	private boolean generating = false;
 	
 	public void startGen(){
@@ -17,8 +23,6 @@ public void stopGen(){
 	
 	@Override
 	public void run() {
-
-		RabbitClient client = RabbitClient.getInstance();
 		while (true){
 			if (generating){
 				Random random = new Random();
@@ -28,7 +32,7 @@ public void run() {
 				order.setAmount(value);
 				order.setState(state);
 				try {
-					client.post(order);
+					rabbitClient.post(order);
 				} catch (IOException e1) {
 					throw new RuntimeException(e1);
 				}
diff --git a/src/main/java/com/pivotal/example/xd/RabbitClient.java b/src/main/java/com/pivotal/example/xd/RabbitClient.java
index 2b75619..ee12b5e 100644
--- a/src/main/java/com/pivotal/example/xd/RabbitClient.java
+++ b/src/main/java/com/pivotal/example/xd/RabbitClient.java
@@ -1,76 +1,42 @@
 package com.pivotal.example.xd;
 
 import java.io.IOException;
-import java.util.Iterator;
+
+import javax.annotation.PostConstruct;
 
 import org.apache.log4j.Logger;
-import org.springframework.cloud.Cloud;
-import org.springframework.cloud.CloudException;
-import org.springframework.cloud.CloudFactory;
-import org.springframework.cloud.service.ServiceInfo;
-import org.springframework.cloud.service.common.RabbitServiceInfo;
+import org.springframework.amqp.rabbit.connection.Connection;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.QueueingConsumer;
 
+@Service
 public class RabbitClient {
 
 	static Logger logger = Logger.getLogger(RabbitClient.class);
-	private static RabbitClient instance;
 	
 	private static final String QUEUE_NAME="ORDERS_QUEUE";
 
-	private ConnectionFactory factory;
+	private @Autowired(required=false) ConnectionFactory factory;
 	private Connection senderConn;
 	private Connection receiverConn;
-	private String rabbitURI;
-	
-	private RabbitClient(){
-		
-    	try{
-    		Cloud cloud = new CloudFactory().getCloud();
-	    	Iterator<ServiceInfo> services = cloud.getServiceInfos().iterator();
-	    	while (services.hasNext()){
-	    		ServiceInfo svc = services.next();
-	    		if (svc instanceof RabbitServiceInfo){
-	    			RabbitServiceInfo rabbitSvc = ((RabbitServiceInfo)svc);	    			
-	    			rabbitURI=rabbitSvc.getUri();
-	    			
-	    			try{
-	    				factory = new ConnectionFactory();
-	    				factory.setUri(rabbitURI);
-	    				senderConn = factory.newConnection();
-	    				receiverConn = factory.newConnection();
-	    			}
-	    			catch(Exception e){
-	    				throw new RuntimeException("Exception connecting to RabbitMQ",e);
-	    			}
-	    			
-	    		}
-	    	}
-    	}
-    	catch(CloudException ce){
-    		// means its not being deployed on Cloud
-    		logger.warn(ce.getMessage());
-    	}
-		
-		
-	}
 	
-	public static synchronized RabbitClient getInstance(){
-		if (instance==null){
-			instance = new RabbitClient(); 
+	@PostConstruct
+	public void init() {
+		if (factory != null) {
+			senderConn = factory.createConnection();
+			receiverConn = factory.createConnection();
 		}
-		return instance;
 	}
 	
 	public synchronized void post(Order order) throws IOException{
 		if (senderConn==null || !senderConn.isOpen()){
-			senderConn = factory.newConnection();
+			senderConn = factory.createConnection();
 		}
-		Channel channel = senderConn.createChannel();
+		Channel channel = senderConn.createChannel(false);
 		channel.queueDeclare(QUEUE_NAME, false, false, false, null);
 	    channel.basicPublish("", QUEUE_NAME, null, order.toBytes());
 	    channel.close();		
@@ -78,9 +44,9 @@ public synchronized void post(Order order) throws IOException{
 	
 	public synchronized QueueingConsumer consumeOrders() throws IOException{
 		if (receiverConn==null || !receiverConn.isOpen()){
-			receiverConn = factory.newConnection();
+			receiverConn = factory.createConnection();
 		}
-		Channel channel = receiverConn.createChannel();
+		Channel channel = receiverConn.createChannel(false);
 	    channel.queueDeclare(QUEUE_NAME, false, false, false, null);
 	    QueueingConsumer consumer = new QueueingConsumer(channel);
 	    channel.basicConsume(QUEUE_NAME, true, consumer);
@@ -88,10 +54,6 @@ public synchronized QueueingConsumer consumeOrders() throws IOException{
 	}
 	
 	public boolean isBound(){
-		return (rabbitURI!=null);
-	}
-	
-	public String getRabbitURI(){
-		return rabbitURI;
+		return factory!=null;
 	}
 }
diff --git a/src/main/java/com/pivotal/example/xd/controller/CustomerController.java b/src/main/java/com/pivotal/example/xd/controller/CustomerController.java
new file mode 100644
index 0000000..47232cc
--- /dev/null
+++ b/src/main/java/com/pivotal/example/xd/controller/CustomerController.java
@@ -0,0 +1,69 @@
+package com.pivotal.example.xd.controller;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+import javax.sql.DataSource;
+
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.pivotal.example.xd.BootstrapDataPopulator;
+import com.pivotal.example.xd.Customer;
+
+@Controller
+public class CustomerController {
+	@Autowired @Qualifier("hawqDataSource") DataSource hawqDataSource;
+
+	static Logger logger = Logger.getLogger(CustomerController.class);
+
+	@RequestMapping("/getCustomer")
+	public @ResponseBody Customer getCustomer(@RequestParam(value="lName", required=false, defaultValue="Test")String last_name) {
+		//get Customer from HAWQ table
+		Customer cust = null;
+		try {
+			Connection conn = null;
+			conn = hawqDataSource.getConnection();
+			PreparedStatement pstmt = conn.prepareStatement(BootstrapDataPopulator.SELECT_CUSTOMER_LNAME);
+			pstmt.setString(1, last_name);
+			ResultSet rs = pstmt.executeQuery();
+			while (rs.next()){
+				logger.warn("Row Num: " + rs.getRow());
+				logger.warn(Integer.parseInt(rs.getString("customer_id")) +  "\t" + rs.getString("first_name") + "\t" + rs.getString("last_name") + "\t" + rs.getString("gender"));
+				cust = new Customer(rs.getString("first_name"), rs.getString("last_name"), rs.getString("gender"), Integer.parseInt(rs.getString("customer_id")));	
+			}
+			
+		} catch (Exception e){
+			logger.error("Cannot get data from HAWQ table", e);
+		}
+		
+		//return new Customer(first_name, last_name,  gender, id);
+		return cust;
+	}
+	
+	@RequestMapping("/getAllCustomers")
+	public @ResponseBody String getAllCustomers() {
+		//get all Customers from HAWQ table
+		String cust = "";
+		try {
+			Connection conn = hawqDataSource.getConnection();
+			PreparedStatement pstmt = conn.prepareStatement(BootstrapDataPopulator.SELECT_CUSTOMERS);
+			ResultSet rs = pstmt.executeQuery();
+			while (rs.next()){
+				logger.warn("Row Num: " + rs.getRow());
+				logger.warn(Integer.parseInt(rs.getString("customer_id")) +  "\t" + rs.getString("first_name") + "\t" + rs.getString("last_name") + "\t" + rs.getString("gender"));
+				cust += new Customer(rs.getString("first_name"), rs.getString("last_name"), rs.getString("gender"), Integer.parseInt(rs.getString("customer_id"))).toString();
+			}
+		} catch (Exception e){
+			logger.error("Cannot get data from HAWQ table", e);
+		}
+		
+		return cust;
+	}
+}
diff --git a/src/main/java/com/pivotal/example/xd/controller/OrderController.java b/src/main/java/com/pivotal/example/xd/controller/OrderController.java
index bdfb32a..049f614 100644
--- a/src/main/java/com/pivotal/example/xd/controller/OrderController.java
+++ b/src/main/java/com/pivotal/example/xd/controller/OrderController.java
@@ -1,21 +1,28 @@
 package com.pivotal.example.xd.controller;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 
-import javax.servlet.ServletContext;
+import javax.annotation.PostConstruct;
+import javax.sql.DataSource;
 
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.pivotal.example.xd.BootstrapDataPopulator;
 import com.pivotal.example.xd.HeatMap;
 import com.pivotal.example.xd.Order;
 import com.pivotal.example.xd.OrderConsumer;
@@ -27,33 +34,31 @@
  */
 @Controller
 public class OrderController {
+	static Logger logger = Logger.getLogger(OrderController.class);
 	
-	@Autowired
-	ServletContext context;
+	@Autowired @Qualifier("gemfirexdDataSource") DataSource gemfirexdDataSource;
+	@Autowired private RabbitClient rabbitClient;
+	@Autowired OrderGenerator orderGenerator;
+	@Autowired OrderConsumer orderConsumer;
 	
 	private static Map<String,Queue<Order>> stateOrdersMap = new HashMap<String, Queue<Order>>();
-	private static RabbitClient client ;
 
 	boolean generatingData = false;
 	
-	static Logger logger = Logger.getLogger(OrderController.class);
-
-	OrderGenerator generator = new OrderGenerator();
-	Thread threadSender = new Thread (generator);
-	Thread threadConsumer = new Thread (new OrderConsumer());
-	
-	
     public OrderController(){
     	
-    	client = RabbitClient.getInstance();
-    	
     	for (int i=0; i<HeatMap.states.length; i++){
     		stateOrdersMap.put(HeatMap.states[i], new ArrayBlockingQueue<Order>(10));
     	}
-    	threadSender.start();
-    	threadConsumer.start();
+    }
+    
+    @PostConstruct
+    public void init() {
+	    	Thread threadSender = new Thread (orderGenerator);
+	    	Thread threadConsumer = new Thread (orderConsumer);
 
-    	
+	    	threadSender.start();
+	    	threadConsumer.start();
     }
 	
 	private int getOrderSum(String state){
@@ -70,17 +75,37 @@ private int getOrderSum(String state){
     
 
 	
-	public static synchronized void registerOrder(Order order){
+	public synchronized void registerOrder(Order order){
 		Queue<Order> orderQueue = stateOrdersMap.get(order.getState());
 		if (!orderQueue.offer(order)){
 			orderQueue.remove();
 			orderQueue.add(order);
 		}				
+		// Persist to GemXD
+		Connection conn = null;
+		try {
+			conn = gemfirexdDataSource.getConnection();
+			PreparedStatement pstmt = conn.prepareStatement(BootstrapDataPopulator.INSERT_ORDER);
+			pstmt.setString(1, order.getState());
+			pstmt.setInt(2, order.getAmount());
+			pstmt.executeUpdate();
+			conn.commit();
+			
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		finally{
+			try{
+				if (conn!=null) conn.close();
+			}catch(Exception e){}
+		}
+		
 	}
     
 	@RequestMapping(value = "/")
 	public String home(Model model) {
-		model.addAttribute("rabbitURI", client.getRabbitURI());	
+		model.addAttribute("rabbitBound", rabbitClient.isBound());	
         return "WEB-INF/views/pcfdemo.jsp";
     }
 
@@ -96,25 +121,24 @@ public String home(Model model) {
     
     @RequestMapping(value="/startStream")
     public @ResponseBody String startStream(){
-		logger.warn("Rabbit URI "+client.getRabbitURI());
-		if (client.getRabbitURI()==null) return "Please bind a RabbitMQ service";
+		logger.warn("Rabbit bound " + rabbitClient.isBound());
+		if (!rabbitClient.isBound()) return "Please bind a RabbitMQ service";
     	
     	if (generatingData) return "Data already being generated";
     	
-    	generator.startGen();
+    	orderGenerator.startGen();
     	return "Started";
 
     }    	
 
     @RequestMapping(value="/stopStream")
     public @ResponseBody String stopStream(){
-		logger.warn("Rabbit URI "+client.getRabbitURI());
-		if (client.getRabbitURI()==null) return "Please bind a RabbitMQ service";
+		logger.warn("Rabbit bound " + rabbitClient.isBound());
+		if (!rabbitClient.isBound()) return "Please bind a RabbitMQ service";
     	
     	if (!generatingData) return "Not Streaming";
     	generatingData = false;
-    	generator.stopGen();
-    	
+    	orderGenerator.stopGen();
     	return "Stopped";
 
     }    	
@@ -125,7 +149,28 @@ public String home(Model model) {
 		System.exit(-1);    	
     	return "Killed";
 
-    }       
+    }  
+    
+    @RequestMapping(value="/getOrders")
+    public @ResponseBody String getOrders(){
+		logger.warn("getOrders Called");
+		try {
+			Connection conn = gemfirexdDataSource.getConnection();
+			//java.sql.DatabaseMetaData metadata = conn.getMetaData();
+			//ResultSet rs = metadata.getTables(null, null, "ORDERS", null);
+			PreparedStatement pstmt = conn.prepareStatement(BootstrapDataPopulator.SELECT_ORDER);
+			ResultSet rs = pstmt.executeQuery();
+			while (rs.next()){
+				logger.warn("Row Num: " + rs.getRow());
+				logger.warn(Integer.parseInt(rs.getString("SUM")) +  "\t" + rs.getString("STATE"));	
+			}
+
+		}catch (Exception e) {
+			logger.error("Could not get Data from GemXD Table " + e);
+		}
+    	return "Logged data from Gem table";
+
+    } 
     
     @RequestMapping(value="/getHeatMap")
     public @ResponseBody HeatMap getHistograms(){
diff --git a/src/main/webapp/WEB-INF/lib/gemfirexd-1.0.6.jar b/src/main/webapp/WEB-INF/lib/gemfirexd-1.0.6.jar
new file mode 100644
index 0000000..64de686
Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/gemfirexd-1.0.6.jar differ
diff --git a/src/main/webapp/WEB-INF/spring/servlet-context.xml b/src/main/webapp/WEB-INF/spring/servlet-context.xml
index 23cddc2..7dcb695 100644
--- a/src/main/webapp/WEB-INF/spring/servlet-context.xml
+++ b/src/main/webapp/WEB-INF/spring/servlet-context.xml
@@ -19,14 +19,18 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd
 		http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/cloud http://www.springframework.org/schema/cloud/spring-cloud.xsd"
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
 		>
 	
 
 
 	<context:component-scan base-package="com.pivotal"/>
+    <context:annotation-config/>
+   
     <mvc:annotation-driven/>
+   
+    
+    
     <mvc:resources mapping="/resources/**" location="/resources/" />
     
 	<mvc:resources mapping="/resources/**" location="/resources/" />
@@ -63,6 +67,24 @@
 	</bean>
  
 	<context:property-placeholder location="classpath:app.properties" />
+	
+	<!-- 
+	<cloud:data-source id="phd1" />
+	 -->
+	
+	
+	<!-- 
+	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
+		destroy-method="close">
+		<property name="driverClassName" value="org.postgresql.Driver" />
+		<property name="url" value="jdbc:postgresql://${cloud.services.hawq.connection.hostname}:${cloud.services.hawq.connection.port}/${cloud.services.hawq.connection.name}" />
+		<property name="username" value="${cloud.services.hawq.connection.username}" />
+		<property name="password" value="${cloud.services.hawq.connection.password}" />
+	</bean>
+
+		 -->		
+	
+	
 <!-- 
 	<cloud:rabbit-connection-factory id="connectionFactory" service-name="myrabbitmq"/>	
 
diff --git a/src/main/webapp/WEB-INF/views/pcfdemo.jsp b/src/main/webapp/WEB-INF/views/pcfdemo.jsp
index c834549..87d3ec8 100644
--- a/src/main/webapp/WEB-INF/views/pcfdemo.jsp
+++ b/src/main/webapp/WEB-INF/views/pcfdemo.jsp
@@ -100,7 +100,7 @@
 	          <img src="resources/img/BestRetailInc_Logo.png" alt="Best Retail, Inc.">
 	        </div>
 	        <div class="nav">
-	        	<input type="button" value="Orders US Heat Map" class="activate nav-link" >
+	        	<input type="button" value="Orders EU Heat Map" class="activate nav-link" >
 	        	<input type="button" value="Start Data Stream" class="activate nav-link" onclick="startStream();">
 	        	<input type="button" value="Kill App" class="activate nav-link" onclick="killApp();">
 	        </div>
@@ -111,7 +111,7 @@
 		<div align="center"> 
         <small>Instance hosted at &nbsp;<%=request.getLocalAddr() %>:<%=request.getLocalPort() %></small><br>
 		<c:choose>
-			<c:when test="${rabbitURI != null}">
+			<c:when test="${rabbitBound}">
 				<small>Data being streamed from RabbitMQ</small>				
 			</c:when>
 			<c:otherwise>
@@ -659,7 +659,7 @@ function click(d) {
 		        chart2.chartSeries[Name] = data;
 		    }
 	    });       
-		setTimeout(updateData, 50);
+		setTimeout(updateData, 5000);
 		
 	};          
 	/*
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 1cf22e4..0911b69 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,19 +1,16 @@
-<web-app version="2.5" 
-		 xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-    <servlet>
-        <servlet-name>appServlet</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <init-param>
-            <param-name>contextConfigLocation</param-name>
-            <param-value>/WEB-INF/spring/servlet-context.xml</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>appServlet</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-</web-app>
+<?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" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+  <servlet>
+    <servlet-name>appServlet</servlet-name>
+    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+    <init-param>
+      <param-name>contextConfigLocation</param-name>
+      <param-value>/WEB-INF/spring/servlet-context.xml</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>appServlet</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+</web-app>
\ No newline at end of file