diff --git a/src/StockExchange/BuyOrder.java b/src/StockExchange/BuyOrder.java
index 266ec52..2bed299 100644
--- a/src/StockExchange/BuyOrder.java
+++ b/src/StockExchange/BuyOrder.java
@@ -1,21 +1,19 @@
 package StockExchange;
 
-public class BuyOrder  extends Order implements Comparable<Order>{
-	
-	
-	
-	public int compareTo(Order o){
+public class BuyOrder extends Order implements Comparable<Order> {
 
-		if (o.limit < limit)
-		{
-			//System.out.println("return 1");
-			return -1;
-		}
-		if (o.limit > limit){
-			//System.out.println("return -1");
-			return +1;
-		}
+    @Override
+    public int compareTo(Order o) {
+
+        if (o.limit < limit) {
+            //System.out.println("return 1");
+            return -1;
+        }
+        if (o.limit > limit) {
+            //System.out.println("return -1");
+            return +1;
+        }
 //		System.out.println("0000000000000000000000");
-		return 0;
-	}
+        return 0;
+    }
 }
diff --git a/src/StockExchange/Exchange.java b/src/StockExchange/Exchange.java
index 97482ff..1c434cd 100644
--- a/src/StockExchange/Exchange.java
+++ b/src/StockExchange/Exchange.java
@@ -28,7 +28,7 @@ public class Exchange extends Thread {
     }
 
     // Here we store the list of quote receivers
-    TreeSet<QuoteReceiver> qrlist = new TreeSet<QuoteReceiver>();
+    TreeSet<QuoteReceiver> qrlist = new TreeSet();
 
     public void AddQuoteReceiver(QuoteReceiver qr) {
         qrlist.add(qr);
@@ -52,7 +52,7 @@ public class Exchange extends Thread {
     long lastsize;
 
     // Order orderlist[];
-    TreeSet<BuyOrder> bid = new TreeSet<BuyOrder>();
+    TreeSet<BuyOrder> bid = new TreeSet();
     TreeSet<SellOrder> ask = new TreeSet<SellOrder>();
 
     private final Semaphore available = new Semaphore(1, true);
diff --git a/src/StockExchange/Order.java b/src/StockExchange/Order.java
index f772bcc..ef15f37 100644
--- a/src/StockExchange/Order.java
+++ b/src/StockExchange/Order.java
@@ -1,41 +1,44 @@
 package StockExchange;
- 
 
-public abstract class Order implements Comparable<Order>{
-	public long timestamp=0;
-	public long size;
-	public double limit;
+public abstract class Order implements Comparable<Order> {
+
+    /**
+     * when
+     */
+    public long timestamp = 0;
+    public long size;
+    public double limit;
 //	long time;
-	double money=0;
+    double money = 0;
 //	public long shares=0;
-	public long id=0;
-	public Account account=null;
-	
-	
-	enum OrderStatus {
-		open,executed,canceled
-	}
-	
-	OrderStatus status=OrderStatus.open;
-	
-	public long getAge(){
-		if (timestamp==0)
-			return 0;
-		return System.currentTimeMillis()-timestamp;
-	}
-	
-	String format_limit(){
-		if (limit <0.0){
-			return "n.a.";
-		}
-		return String.format("%.2f",limit); 
-	}
+    public long id = 0;
+    public Account account = null;
 
-	String format_size(){
-		return String.format("%d", size);
-	}
-	
-	Order(){
-		
-	}
+    enum OrderStatus {
+        open, executed, canceled
+    }
+
+    OrderStatus status = OrderStatus.open;
+
+    public long getAge() {
+        if (timestamp == 0) {
+            return 0;
+        }
+        return System.currentTimeMillis() - timestamp;
+    }
+
+    String format_limit() {
+        if (limit < 0.0) {
+            return "n.a.";
+        }
+        return String.format("%.2f", limit);
+    }
+
+    String format_size() {
+        return String.format("%d", size);
+    }
+
+    Order() {
+
+    }
 }
diff --git a/src/sesim/SeSim.java b/src/sesim/SeSim.java
index 1b2602d..6b7e2e4 100644
--- a/src/sesim/SeSim.java
+++ b/src/sesim/SeSim.java
@@ -5,6 +5,8 @@
  */
 package sesim;
 
+import StockExchange.*;
+
 /**
  *
  * @author tube
@@ -15,6 +17,10 @@ public class SeSim {
      * @param args the command line arguments
      */
     public static void main(String[] args) {
+        Exchange se = new StockExchange.Exchange();
+        se.start();
+        
+        
         // TODO code application logic here
     }