diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java
index 9321762..841fbb4 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java
@@ -1,5 +1,6 @@
 package edu.ntnu.idi.idatt2003.g40.mappe;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.FileConverter;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.FileParser;
@@ -38,18 +39,6 @@
  * */
 public class Main extends Application {
 
-  static void main() {
-    FileParser parser1 = new FileParser("src/main/resources/dummydata.txt");
-    FileConverter converter1 = new FileConverter();
-    try {
-      List<Stock> stocksInFile = converter1.getStocksFromStrings(parser1.readFile());
-      parser1.writeStocksToFile(converter1.stocksToStrings(stocksInFile));
-      stocksInFile.forEach(s -> System.out.println(s.getSymbol()));
-    } catch (IOException e) {
-      System.err.println(e.getMessage());
-    }
-  }
-
   /**
    * {@inheritDoc}
    * */
@@ -66,6 +55,14 @@ public void start(final Stage stage) throws Exception {
     EventManager eventManager = new EventManager();
     ViewManager viewManager = new ViewManager(stage, eventManager);
 
+    List<Stock> stocksInFile;
+    FileParser parser1 = new FileParser("src/main/resources/dummydata.txt");
+
+    FileConverter converter1 = new FileConverter();
+    stocksInFile = converter1.getStocksFromStrings(parser1.readFile());
+
+    Exchange exchange = new Exchange("Exchange", stocksInFile);
+
     // Main menu
     MainMenuView mainMenuView = new MainMenuView();
     new MainMenuController(mainMenuView, eventManager);
@@ -85,7 +82,7 @@ public void start(final Stage stage) throws Exception {
 
     // Summary section of the top bar
     SummaryView summaryView = new SummaryView();
-    new SummaryController(summaryView, eventManager);
+    new SummaryController(summaryView, eventManager, exchange);
 
     // Top bar
     TopBarView topBarView = new TopBarView(summaryView);
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryController.java
index fecc2ae..5f720e8 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryController.java
@@ -1,23 +1,31 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.financialsummary;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
 
 public class SummaryController extends ViewController<SummaryView> {
 
+  private Exchange exchange;
   /**
    * {@inheritDoc}.
    */
   public SummaryController(final SummaryView viewElement,
-                           final EventManager eventManager)
+                           final EventManager eventManager,
+                           final Exchange exchange)
           throws IllegalArgumentException {
+    this.exchange = exchange;
     super(viewElement, eventManager);
   }
 
   @Override
   protected void initInteractions() {
     getViewElement().setOnAction(SummaryActions.NEXT_WEEK, () -> {
-      System.out.println("Next week!");
+      exchange.nextWeek();
+    });
+
+    exchange.weekProperty().addListener((observable, o, n) -> {
+      getViewElement().setWeek((Integer) n);
     });
   }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryView.java
index 100f9eb..816d87f 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryView.java
@@ -84,7 +84,7 @@ protected void initLayout() {
     navInfo.setAlignment(Pos.TOP_CENTER);
 
     nextBtn = new Button("next");
-    weekLabel = new Label("week: 0");
+    weekLabel = new Label("week: 1");
     weekLabel.getStyleClass().add("week-label");
     Region spacerR = new Region();
     VBox.setVgrow(spacerR, Priority.ALWAYS);
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/stats/StatsController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/stats/StatsController.java
index 275ea4f..873ca7b 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/stats/StatsController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/stats/StatsController.java
@@ -1,4 +1,46 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.stats;
 
-public class StatsController {
+import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Transaction;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.PurchaseCalculator;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionFactory;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionType;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
+
+import java.math.BigDecimal;
+
+public class StatsController extends ViewController<StatsView> {
+
+  private Player player;
+  private Exchange exchange;
+
+  /**
+   * {@inheritDoc}
+   */
+  public StatsController(final StatsView viewElement,
+                         final EventManager eventManager,
+                         final Player player,
+                         final Exchange exchange)
+          throws IllegalArgumentException {
+    this.player = player;
+    this.exchange = exchange;
+    super(viewElement, eventManager);
+  }
+
+  @Override
+  protected void initInteractions() {
+    getViewElement().setOnAction(StatsActions.BUY_SHARES, () -> {
+      BigDecimal amountToBuy = new BigDecimal("1.0");
+      Transaction transaction = exchange.buy(
+              getViewElement().getCurrentStock().getSymbol(),
+              amountToBuy,
+              player
+      );
+
+    });
+  }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/stats/StatsView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/stats/StatsView.java
index 4b6e832..0c4c702 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/stats/StatsView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/stats/StatsView.java
@@ -9,10 +9,10 @@
 import javafx.scene.chart.XYChart;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
-import javafx.scene.control.ScrollBar;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 
 public class StatsView extends ViewElement<HBox, StatsActions> {
@@ -22,7 +22,9 @@ public class StatsView extends ViewElement<HBox, StatsActions> {
   private ArrayList<Stock> stocks;
   private ArrayList<String> stockStrings;
   private ArrayList<Button> stockButtons;
-  private Label selectedStock;
+  private Stock selectedStock;
+  private Label selectedStockLabel;
+  private HBox tradeActions;
 
   public StatsView() {
     super(new HBox(), StatsActions.class);
@@ -36,6 +38,7 @@ protected void initLayout() {
     sidebar = new VBox(10);
     sidebar.setPrefWidth(150);
     sidebar.setMaxHeight(Double.MAX_VALUE);
+    sidebar.setMinWidth(150);
     VBox.setVgrow(sidebar, Priority.ALWAYS);
 
     stocks = new ArrayList<>();
@@ -63,8 +66,6 @@ protected void initLayout() {
     stockStrings.add("NVID");
     stockStrings.add("NVID");
 
-
-
     stockButtons = new ArrayList<>();
     for (String t : stockStrings) {
       Button btn = new Button(t);
@@ -76,17 +77,18 @@ protected void initLayout() {
     scrollPane.setFitToWidth(true);
     scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
     scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+    scrollPane.setMinWidth(150);
 
     VBox.setVgrow(scrollPane, Priority.ALWAYS);
     scrollPane.setMaxHeight(Double.MAX_VALUE);
 
     VBox mainContent = new VBox(20);
     mainContent.setAlignment(Pos.CENTER);
-    HBox.setHgrow(mainContent, Priority.ALWAYS);
     mainContent.setMaxHeight(Double.MAX_VALUE);
+    HBox.setHgrow(mainContent, Priority.ALWAYS);
     VBox.setVgrow(mainContent, Priority.ALWAYS);
 
-    selectedStock = new Label("APL");
+    selectedStockLabel = new Label("AAPL");
 
     NumberAxis xAxis = new NumberAxis(1, 22, 1);
     xAxis.setMinorTickVisible(false);
@@ -115,10 +117,11 @@ protected void initLayout() {
     chart.minHeightProperty().set(50);
     chart.getData().add(dataSeries);
 
-    // Trade Buttons Row
-    HBox tradeActions = new HBox();
+    tradeActions = new HBox();
     tradeActions.setAlignment(Pos.CENTER);
-    tradeActions.setSpacing(300); // Push buy/sell to opposite sides
+    tradeActions.setMaxWidth(500);
+    tradeActions.setPrefWidth(500);
+    tradeActions.minWidth(100);
 
     Button buyBtn = new Button("buy");
     buyBtn.getStyleClass().add("buy-button");
@@ -128,18 +131,32 @@ protected void initLayout() {
     sellBtn.getStyleClass().add("sell-button");
     registerButton(StatsActions.SELL_SHARES, sellBtn);
 
-    tradeActions.getChildren().addAll(buyBtn, sellBtn);
+    Region spacer = new Region();
+    HBox.setHgrow(spacer, Priority.ALWAYS);
+    tradeActions.getChildren().addAll(buyBtn, spacer, sellBtn);
 
-    mainContent.getChildren().addAll(selectedStock, chart, tradeActions);
+    mainContent.getChildren().addAll(selectedStockLabel, chart, tradeActions);
     getRootPane().getChildren().addAll(scrollPane, mainContent);
+
+    registerButton(StatsActions.BUY_SHARES, buyBtn);
+    registerButton(StatsActions.SELL_SHARES, sellBtn);
   }
 
   @Override
   protected void initStyling() {
     sidebar.getStyleClass().add("market-sidebar");
+    tradeActions.getStyleClass().add("trade-actions");
     for (Button b : stockButtons) {
       b.getStyleClass().add("stock-button");
     }
-    selectedStock.getStyleClass().add("selected-stock-pill");
+    selectedStockLabel.getStyleClass().add("selected-stock-pill");
+  }
+
+  public void setCurrentStock(final Stock stock) {
+    selectedStock = stock;
+  }
+
+  public Stock getCurrentStock() {
+    return selectedStock;
   }
 }
diff --git a/src/main/resources/styles.css b/src/main/resources/styles.css
index 43fe000..6001869 100644
--- a/src/main/resources/styles.css
+++ b/src/main/resources/styles.css
@@ -239,8 +239,6 @@
 
 /* --------------- IN GAME VIEW ------------- */
 .market-sidebar {
-    -fx-border-color: transparent black transparent transparent;
-    -fx-border-width: 0 1 0 0;
     -fx-padding: 20;
 }