From 07a7a1cb3e4cfc1580bc05b0a6010a1e9f7e7508 Mon Sep 17 00:00:00 2001
From: Kostya <mail@sartin.in>
Date: Sun, 16 Aug 2026 11:55:08 +0000
Subject: Rename Option/Account to Market/Ledger, add Result-based error
 handling

Split GuessMarketContext into a separate CatalogContext for read-only
event listing, wrap fallible operations in Result<T> instead of throwing,
and wire load/save of events and users through a JSON Wrapper.
---
 .../main/java/market/guess/api/CatalogContext.java | 12 ++++
 .../main/java/market/guess/api/EventStatus.java    |  4 +-
 .../java/market/guess/api/EventSummaryDTO.java     |  2 +-
 .../java/market/guess/api/GuessMarketContext.java  | 23 ++-----
 api/src/main/java/market/guess/api/MarketDTO.java  |  3 +
 .../main/java/market/guess/api/MarketStateDTO.java |  2 +-
 .../main/java/market/guess/api/OptionStateDTO.java |  3 -
 api/src/main/java/market/guess/api/Result.java     | 49 +++++++++++++++
 .../main/java/market/guess/api/TradeRowDTO.java    |  2 +-
 .../market/guess/service/LocalCatalogContext.java  | 45 +++++++++++++
 .../guess/service/LocalGuessMarketContext.java     | 61 +++++++-----------
 .../market/guess/service/TradingOperation.java     |  4 +-
 .../market/guess/service/TradingOperationImpl.java |  4 +-
 .../java/market/guess/service/domain/Account.java  | 49 ---------------
 .../java/market/guess/service/domain/Event.java    | 73 +++++++++++++++-------
 .../market/guess/service/domain/LedgerEntry.java   | 13 ----
 .../java/market/guess/service/domain/Market.java   | 32 ++++++++++
 .../java/market/guess/service/domain/Option.java   |  3 -
 .../java/market/guess/service/domain/User.java     |  7 ++-
 .../service/infrastructure/MarketContext.java      | 34 +++++++++-
 .../infrastructure/mapper/v1/EventMapperV1.java    |  8 +--
 .../infrastructure/mapper/v2/EventMapperV2.java    | 10 +--
 .../repository/InMemoryEventRepository.java        |  5 ++
 .../repository/InMemoryUserRepository.java         |  5 ++
 .../infrastructure/repository/Repository.java      |  2 +
 .../java/market/guess/service/ledger/Ledger.java   | 35 +++++++++++
 .../market/guess/service/ledger/LedgerContext.java | 49 +++++++++++++++
 .../market/guess/service/ledger/LedgerEntry.java   | 13 ++++
 .../main/java/market/guess/ui/console/Menu.java    |  2 +-
 .../guess/ui/console/command/BuyMenuCommand.java   | 54 ++++++++--------
 .../console/command/EventDetailsMenuCommand.java   |  6 --
 .../guess/ui/console/command/ExitMenuCommand.java  |  5 --
 .../ui/console/command/ListEventsMenuCommand.java  | 20 +++---
 .../ui/console/command/LoadFileMenuCommand.java    | 33 +++++-----
 .../command/LoadMarketStateMenuCommand.java        | 26 +++++---
 .../guess/ui/console/command/MenuCommand.java      |  2 -
 .../command/SaveMarketStateMenuCommand.java        |  6 --
 .../ui/console/command/SettleEventMenuCommand.java |  6 --
 .../market/guess/ui/console/io/InputProcessor.java | 43 +++++++++++--
 39 files changed, 491 insertions(+), 264 deletions(-)
 create mode 100644 api/src/main/java/market/guess/api/CatalogContext.java
 create mode 100644 api/src/main/java/market/guess/api/MarketDTO.java
 delete mode 100644 api/src/main/java/market/guess/api/OptionStateDTO.java
 create mode 100644 api/src/main/java/market/guess/api/Result.java
 create mode 100644 service/src/main/java/market/guess/service/LocalCatalogContext.java
 delete mode 100644 service/src/main/java/market/guess/service/domain/Account.java
 delete mode 100644 service/src/main/java/market/guess/service/domain/LedgerEntry.java
 create mode 100644 service/src/main/java/market/guess/service/domain/Market.java
 delete mode 100644 service/src/main/java/market/guess/service/domain/Option.java
 create mode 100644 service/src/main/java/market/guess/service/ledger/Ledger.java
 create mode 100644 service/src/main/java/market/guess/service/ledger/LedgerContext.java
 create mode 100644 service/src/main/java/market/guess/service/ledger/LedgerEntry.java

diff --git a/api/src/main/java/market/guess/api/CatalogContext.java b/api/src/main/java/market/guess/api/CatalogContext.java
new file mode 100644
index 0000000..7e80042
--- /dev/null
+++ b/api/src/main/java/market/guess/api/CatalogContext.java
@@ -0,0 +1,12 @@
+package market.guess.api;
+
+import java.nio.file.Path;
+import java.util.List;
+
+public interface CatalogContext {
+  Result<LoadResultDTO> loadEvents(Path path);
+
+  Result<List<EventSummaryDTO>> getAllEvents();
+
+  Result<EventDetailDTO> getEvent(String eventKey);
+}
diff --git a/api/src/main/java/market/guess/api/EventStatus.java b/api/src/main/java/market/guess/api/EventStatus.java
index acd7542..6580157 100644
--- a/api/src/main/java/market/guess/api/EventStatus.java
+++ b/api/src/main/java/market/guess/api/EventStatus.java
@@ -1,7 +1,7 @@
 package market.guess.api;
 
 public enum EventStatus {
-  NOT_STARTED,
+  DRAFT,
   ACTIVE,
-  CLOSED
+  SETTLED
 }
diff --git a/api/src/main/java/market/guess/api/EventSummaryDTO.java b/api/src/main/java/market/guess/api/EventSummaryDTO.java
index 361656b..d185103 100644
--- a/api/src/main/java/market/guess/api/EventSummaryDTO.java
+++ b/api/src/main/java/market/guess/api/EventSummaryDTO.java
@@ -3,7 +3,7 @@ package market.guess.api;
 import java.util.List;
 
 public record EventSummaryDTO(
-    String eventKey,
+    String key,
     int displayId,
     String name,
     String description,
diff --git a/api/src/main/java/market/guess/api/GuessMarketContext.java b/api/src/main/java/market/guess/api/GuessMarketContext.java
index d959de6..4eee37e 100644
--- a/api/src/main/java/market/guess/api/GuessMarketContext.java
+++ b/api/src/main/java/market/guess/api/GuessMarketContext.java
@@ -1,27 +1,16 @@
 package market.guess.api;
 
 import java.nio.file.Path;
-import java.util.List;
-import market.guess.exception.GuessMarketException;
 
 public interface GuessMarketContext {
-  LoadResultDTO loadEvents(Path path);
+  Result<PurchaseReceiptDTO> buyShares(
+      String userName, String eventKey, String optionKey, int quantity);
 
-  List<EventSummaryDTO> listEvents();
+  Result<EventDetailDTO> closeEvent(String userName, String eventKey, String winningOptionKey);
 
-  boolean isLoaded();
+  Result<AccountDTO> account(String userName);
 
-  EventDetailDTO getEvent(String eventKey);
+  Result<Void> saveState(Path path);
 
-  PurchaseReceiptDTO buyShares(String userName, String eventKey, String optionKey, int quantity)
-      throws GuessMarketException;
-
-  EventDetailDTO closeEvent(String userName, String eventKey, String winningOptionKey)
-      throws GuessMarketException;
-
-  AccountDTO account(String userName);
-
-  void saveState(Path path) throws GuessMarketException;
-
-  LoadResultDTO restoreState(Path path);
+  Result<LoadResultDTO> restoreState(Path path);
 }
diff --git a/api/src/main/java/market/guess/api/MarketDTO.java b/api/src/main/java/market/guess/api/MarketDTO.java
new file mode 100644
index 0000000..b7c48a2
--- /dev/null
+++ b/api/src/main/java/market/guess/api/MarketDTO.java
@@ -0,0 +1,3 @@
+package market.guess.api;
+
+public record MarketDTO(String key, String name, String price, String volume) {}
diff --git a/api/src/main/java/market/guess/api/MarketStateDTO.java b/api/src/main/java/market/guess/api/MarketStateDTO.java
index f49b2aa..1f7e79b 100644
--- a/api/src/main/java/market/guess/api/MarketStateDTO.java
+++ b/api/src/main/java/market/guess/api/MarketStateDTO.java
@@ -5,6 +5,6 @@ import java.util.List;
 public record MarketStateDTO(
     String eventKey,
     MechanismType mechanism,
-    List<OptionStateDTO> options,
+    List<MarketDTO> markets,
     String accountBalance,
     String commissionCollected) {}
diff --git a/api/src/main/java/market/guess/api/OptionStateDTO.java b/api/src/main/java/market/guess/api/OptionStateDTO.java
deleted file mode 100644
index c002fdd..0000000
--- a/api/src/main/java/market/guess/api/OptionStateDTO.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package market.guess.api;
-
-public record OptionStateDTO(String optionKey, String name, String price, long sharesOutstanding) {}
diff --git a/api/src/main/java/market/guess/api/Result.java b/api/src/main/java/market/guess/api/Result.java
new file mode 100644
index 0000000..15ac5db
--- /dev/null
+++ b/api/src/main/java/market/guess/api/Result.java
@@ -0,0 +1,49 @@
+package market.guess.api;
+
+import java.time.Instant;
+
+public final class Result<T> {
+  private final boolean success;
+  private final String message;
+  private final T data;
+  private final Instant timeStamp;
+
+  private Result(boolean success, String message, T data) {
+    this.success = success;
+    this.message = message;
+    this.data = data;
+    this.timeStamp = Instant.now();
+  }
+
+  public static <T> Result<T> ok() {
+    return new Result<T>(true, "Operation successful", null);
+  }
+
+  public static <T> Result<T> ok(T data) {
+    return new Result<>(true, "Operation successful", data);
+  }
+
+  public static <T> Result<T> error(String message, T data) {
+    return new Result<>(false, message, data);
+  }
+
+  public static <T> Result<T> error(String message) {
+    return new Result<>(false, message, null);
+  }
+
+  public boolean isSuccess() {
+    return success;
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  public T getData() {
+    return data;
+  }
+
+  public Instant getTimestamp() {
+    return timeStamp;
+  }
+}
diff --git a/api/src/main/java/market/guess/api/TradeRowDTO.java b/api/src/main/java/market/guess/api/TradeRowDTO.java
index 7331bb1..68d159a 100644
--- a/api/src/main/java/market/guess/api/TradeRowDTO.java
+++ b/api/src/main/java/market/guess/api/TradeRowDTO.java
@@ -1,4 +1,4 @@
 package market.guess.api;
 
 public record TradeRowDTO(
-    String at, String userName, String optionName, long quantity, String pricePaid) {}
+    String at, String userName, String optionName, String quantity, String pricePaid) {}
diff --git a/service/src/main/java/market/guess/service/LocalCatalogContext.java b/service/src/main/java/market/guess/service/LocalCatalogContext.java
new file mode 100644
index 0000000..15a5890
--- /dev/null
+++ b/service/src/main/java/market/guess/service/LocalCatalogContext.java
@@ -0,0 +1,45 @@
+package market.guess.service;
+
+import java.nio.file.Path;
+import java.util.List;
+import market.guess.api.CatalogContext;
+import market.guess.api.EventDetailDTO;
+import market.guess.api.EventSummaryDTO;
+import market.guess.api.LoadResultDTO;
+import market.guess.api.Result;
+import market.guess.service.domain.Event;
+import market.guess.service.infrastructure.MarketContext;
+import market.guess.service.infrastructure.provider.Loader;
+
+public final class LocalCatalogContext implements CatalogContext {
+
+  private final MarketContext context;
+  private final Loader provider;
+
+  public LocalCatalogContext(Loader provider, MarketContext context) {
+    super();
+    this.provider = provider;
+    this.context = context;
+  }
+
+  @Override
+  public Result<LoadResultDTO> loadEvents(Path path) {
+    return Result.ok(provider.load(path));
+  }
+
+  @Override
+  public Result<List<EventSummaryDTO>> getAllEvents() {
+    return Result.ok(context.getEvents().getAll().stream().map(Event::toEventSummary).toList());
+  }
+
+  @Override
+  public Result<EventDetailDTO> getEvent(String eventKey) {
+    var optional = context.getEvents().get(eventKey);
+
+    if (optional.isEmpty()) return Result.error("Unable to find event.");
+    var event = optional.get();
+
+    return Result.ok(
+        new EventDetailDTO(event.toEventSummary(), event.toMarketState(), event.getHistory(), ""));
+  }
+}
diff --git a/service/src/main/java/market/guess/service/LocalGuessMarketContext.java b/service/src/main/java/market/guess/service/LocalGuessMarketContext.java
index b405329..8f97432 100644
--- a/service/src/main/java/market/guess/service/LocalGuessMarketContext.java
+++ b/service/src/main/java/market/guess/service/LocalGuessMarketContext.java
@@ -4,83 +4,66 @@ import java.nio.file.Path;
 import java.util.List;
 import market.guess.api.AccountDTO;
 import market.guess.api.EventDetailDTO;
-import market.guess.api.EventSummaryDTO;
 import market.guess.api.GuessMarketContext;
 import market.guess.api.LoadResultDTO;
+import market.guess.api.ProblemDTO;
 import market.guess.api.PurchaseReceiptDTO;
-import market.guess.exception.GuessMarketException;
-import market.guess.service.domain.Event;
+import market.guess.api.Result;
 import market.guess.service.infrastructure.MarketContext;
-import market.guess.service.infrastructure.provider.Loader;
 
 public final class LocalGuessMarketContext implements GuessMarketContext {
 
   private final TradingOperation tradingOperation;
   private final MarketContext context;
-  private final Loader provider;
 
-  public LocalGuessMarketContext(
-      Loader provider, MarketContext context, TradingOperation tradingOperation) {
+  public LocalGuessMarketContext(MarketContext context, TradingOperation tradingOperation) {
     super();
-    this.provider = provider;
     this.context = context;
     this.tradingOperation = tradingOperation;
   }
 
   @Override
-  public LoadResultDTO loadEvents(Path path) {
-    return provider.load(path);
-  }
-
-  @Override
-  public List<EventSummaryDTO> listEvents() {
-    return context.getEvents().getAll().stream().map(Event::toEventSummary).toList();
-  }
-
-  @Override
-  public boolean isLoaded() {
-    throw new UnsupportedOperationException("Unimplemented method 'isLoaded'");
-  }
-
-  @Override
-  public EventDetailDTO getEvent(String eventKey) {
-    throw new UnsupportedOperationException("Unimplemented method 'getEvent'");
-  }
-
-  @Override
-  public PurchaseReceiptDTO buyShares(
-      String userName, String eventKey, String optionKey, int quantity)
-      throws GuessMarketException {
+  public Result<PurchaseReceiptDTO> buyShares(
+      String userName, String eventKey, String optionKey, int quantity) {
     var optional = context.getEvents().get(eventKey);
 
     var userOptional = context.getUsers().get(userName);
-    if (optional.isEmpty() || userOptional.isEmpty()) throw new GuessMarketException();
+    if (optional.isEmpty() || userOptional.isEmpty()) Result.error("Unable to find user/event.");
 
     var event = optional.get();
     var user = userOptional.get();
     var option = event.getOption(optionKey);
     var trade = tradingOperation.buy(event, user, option, quantity);
-    return new PurchaseReceiptDTO();
+    return Result.ok(new PurchaseReceiptDTO());
   }
 
   @Override
-  public EventDetailDTO closeEvent(String userName, String eventKey, String winningOptionKey)
-      throws GuessMarketException {
+  public Result<EventDetailDTO> closeEvent(
+      String userName, String eventKey, String winningOptionKey) {
     throw new UnsupportedOperationException("Unimplemented method 'account'");
   }
 
   @Override
-  public AccountDTO account(String userName) {
+  public Result<AccountDTO> account(String userName) {
     throw new UnsupportedOperationException("Unimplemented method 'account'");
   }
 
   @Override
-  public void saveState(Path path) throws GuessMarketException {
+  public Result<Void> saveState(Path path) {
     context.save();
+    return Result.ok();
   }
 
   @Override
-  public LoadResultDTO restoreState(Path path) {
-    throw new UnsupportedOperationException("Unimplemented method 'restoreState'");
+  public Result<LoadResultDTO> restoreState(Path path) {
+
+    try {
+      context.load();
+    } catch (Exception e) {
+      return Result.error(
+          "Failed to load.",
+          LoadResultDTO.failure(path.toString(), List.of(new ProblemDTO("", e.getMessage(), ""))));
+    }
+    return Result.ok(LoadResultDTO.success(path.toString(), context.getEvents().getAll().size()));
   }
 }
diff --git a/service/src/main/java/market/guess/service/TradingOperation.java b/service/src/main/java/market/guess/service/TradingOperation.java
index c8153c2..63572c0 100644
--- a/service/src/main/java/market/guess/service/TradingOperation.java
+++ b/service/src/main/java/market/guess/service/TradingOperation.java
@@ -1,13 +1,13 @@
 package market.guess.service;
 
 import market.guess.service.domain.Event;
-import market.guess.service.domain.Option;
+import market.guess.service.domain.Market;
 import market.guess.service.domain.Settlement;
 import market.guess.service.domain.Trade;
 import market.guess.service.domain.User;
 
 public interface TradingOperation {
-  Trade buy(Event event, User user, Option Option, int quantity);
+  Trade buy(Event event, User user, Market Option, int quantity);
 
   Settlement settle(Event event, String winningOption);
 }
diff --git a/service/src/main/java/market/guess/service/TradingOperationImpl.java b/service/src/main/java/market/guess/service/TradingOperationImpl.java
index f6c9aa1..641a3a9 100644
--- a/service/src/main/java/market/guess/service/TradingOperationImpl.java
+++ b/service/src/main/java/market/guess/service/TradingOperationImpl.java
@@ -1,7 +1,7 @@
 package market.guess.service;
 
 import market.guess.service.domain.Event;
-import market.guess.service.domain.Option;
+import market.guess.service.domain.Market;
 import market.guess.service.domain.Settlement;
 import market.guess.service.domain.Trade;
 import market.guess.service.domain.User;
@@ -9,7 +9,7 @@ import market.guess.service.domain.User;
 public final class TradingOperationImpl implements TradingOperation {
 
   @Override
-  public Trade buy(Event event, User user, Option Option, int quantity) {
+  public Trade buy(Event event, User user, Market Option, int quantity) {
     // TODO Auto-generated method stub
     throw new UnsupportedOperationException("Unimplemented method 'buy'");
   }
diff --git a/service/src/main/java/market/guess/service/domain/Account.java b/service/src/main/java/market/guess/service/domain/Account.java
deleted file mode 100644
index 48d5054..0000000
--- a/service/src/main/java/market/guess/service/domain/Account.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package market.guess.service.domain;
-
-import java.math.BigDecimal;
-import java.time.Clock;
-import java.util.ArrayList;
-import java.util.List;
-import market.guess.api.LedgerType;
-
-public final class Account {
-  private final String owner;
-  private final List<LedgerEntry> entries = new ArrayList<>();
-  private BigDecimal balance;
-  private int runningId;
-
-  private final Clock clock;
-
-  public Account(String owner, BigDecimal initialBalance) {
-    this(owner, initialBalance, Clock.systemUTC());
-  }
-
-  public Account(String owner, BigDecimal initialBalance, Clock clock) {
-    super();
-    this.owner = owner;
-    this.balance = BigDecimalOptions.toMoney(initialBalance);
-    this.clock = clock;
-  }
-
-  public String getOwner() {
-    return owner;
-  }
-
-  public BigDecimal getBalance() {
-    return balance;
-  }
-
-  public boolean credit(LedgerType type, BigDecimal amount, String note) {
-    record(type, amount, note);
-    return true;
-  }
-
-  public boolean debit(LedgerType type, BigDecimal amount, String note) {
-    record(type, amount.negate(), note);
-    return true;
-  }
-
-  private void record(LedgerType type, BigDecimal amount, String note) {
-    entries.add(new LedgerEntry(runningId++, clock.instant(), type, amount, balance, note));
-  }
-}
diff --git a/service/src/main/java/market/guess/service/domain/Event.java b/service/src/main/java/market/guess/service/domain/Event.java
index ce35e82..5c98908 100644
--- a/service/src/main/java/market/guess/service/domain/Event.java
+++ b/service/src/main/java/market/guess/service/domain/Event.java
@@ -7,6 +7,9 @@ import java.util.List;
 import market.guess.api.CommissionTiming;
 import market.guess.api.EventStatus;
 import market.guess.api.EventSummaryDTO;
+import market.guess.api.MarketStateDTO;
+import market.guess.api.TradeRowDTO;
+import market.guess.service.ledger.Ledger;
 import market.guess.service.mechanism.TradingMechanism;
 
 public final class Event {
@@ -17,13 +20,13 @@ public final class Event {
   private final int commissionPercent;
   private final CommissionTiming commissionTiming;
   private final TradingMechanism mechanism;
-  private final List<Option> options;
-  private final Account account;
+  private final List<Market> markets;
+  private final Ledger ledger;
   private final String marketMaker;
 
   private int runningId;
   private final List<Trade> trades = new ArrayList<>();
-  private EventStatus status;
+  private EventStatus state;
   private String winningOptionKey;
   private BigDecimal settlementCommission = BigDecimalOptions.ZERO_MONEY;
 
@@ -36,7 +39,7 @@ public final class Event {
       CommissionTiming commissionTiming,
       TradingMechanism mechanism,
       EventStatus status,
-      List<Option> options,
+      List<Market> markets,
       String marketMaker) {
     this.eventKey = eventKey;
     this.displayId = displayId;
@@ -45,10 +48,10 @@ public final class Event {
     this.commissionPercent = commissionPercent;
     this.commissionTiming = commissionTiming;
     this.mechanism = mechanism;
-    this.options = List.copyOf(options);
+    this.markets = markets;
     this.marketMaker = marketMaker;
-    this.account = new Account(eventKey, BigDecimalOptions.ZERO_MONEY);
-    this.status = status;
+    this.ledger = new Ledger(eventKey, BigDecimalOptions.ZERO_MONEY);
+    this.state = status;
   }
 
   public String getEventKey() {
@@ -79,16 +82,16 @@ public final class Event {
     return mechanism;
   }
 
-  public List<Option> getOptions() {
-    return options;
+  public List<Market> getMarkets() {
+    return markets;
   }
 
   public List<String> getOptionsNames() {
-    return options.stream().map(Option::name).toList();
+    return markets.stream().map(Market::getKey).toList();
   }
 
-  public Account getAccount() {
-    return account;
+  public Ledger getLedger() {
+    return ledger;
   }
 
   public String getMarketMaker() {
@@ -99,12 +102,12 @@ public final class Event {
     return trades;
   }
 
-  public EventStatus getStatus() {
-    return status;
+  public EventStatus getState() {
+    return state;
   }
 
-  public void setStatus(EventStatus status) {
-    this.status = status;
+  public void setState(EventStatus status) {
+    this.state = status;
   }
 
   public String getWinningOptionKey() {
@@ -118,12 +121,13 @@ public final class Event {
   public Trade recordTrade(
       Instant time,
       String user,
-      Option option,
+      Market option,
       int quantity,
       BigDecimal cost,
       BigDecimal commission) {
     var trade =
-        new Trade(runningId++, time, user, option.key(), option.name(), quantity, cost, commission);
+        new Trade(
+            runningId++, time, user, option.getKey(), option.getName(), quantity, cost, commission);
     trades.add(trade);
 
     return trade;
@@ -143,6 +147,20 @@ public final class Event {
         .add(settlementCommission);
   }
 
+  public List<TradeRowDTO> getHistory() {
+    var history = new ArrayList<TradeRowDTO>();
+    for (var trade : trades.reversed()) {
+      history.add(
+          new TradeRowDTO(
+              trade.at().toString(),
+              trade.userName(),
+              trade.optionName(),
+              String.valueOf(trade.quantity()),
+              trade.sharesCost().toPlainString()));
+    }
+    return history;
+  }
+
   public EventSummaryDTO toEventSummary() {
     return new EventSummaryDTO(
         eventKey,
@@ -152,14 +170,23 @@ public final class Event {
         commissionPercent,
         commissionTiming,
         mechanism.getType(),
-        status,
+        state,
         getOptionsNames(),
-        account.getBalance().toPlainString());
+        ledger.getBalance().toPlainString());
+  }
+
+  public MarketStateDTO toMarketState() {
+    return new MarketStateDTO(
+        eventKey,
+        mechanism.getType(),
+        markets.stream().map(Market::toMarket).toList(),
+        String.valueOf(ledger.getBalance()),
+        "");
   }
 
-  public Option getOption(String optionKey) {
-    return options.stream()
-        .filter(option -> option.key().equalsIgnoreCase(optionKey))
+  public Market getOption(String optionKey) {
+    return markets.stream()
+        .filter(option -> option.getKey().equalsIgnoreCase(optionKey))
         .findFirst()
         .orElseThrow(() -> new IllegalArgumentException("No such option."));
   }
diff --git a/service/src/main/java/market/guess/service/domain/LedgerEntry.java b/service/src/main/java/market/guess/service/domain/LedgerEntry.java
deleted file mode 100644
index 7e6ff83..0000000
--- a/service/src/main/java/market/guess/service/domain/LedgerEntry.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package market.guess.service.domain;
-
-import java.math.BigDecimal;
-import java.time.Instant;
-import market.guess.api.LedgerType;
-
-public final record LedgerEntry(
-    int id,
-    Instant time,
-    LedgerType type,
-    BigDecimal amount,
-    BigDecimal balanceAfter,
-    String note) {}
diff --git a/service/src/main/java/market/guess/service/domain/Market.java b/service/src/main/java/market/guess/service/domain/Market.java
new file mode 100644
index 0000000..ce95bae
--- /dev/null
+++ b/service/src/main/java/market/guess/service/domain/Market.java
@@ -0,0 +1,32 @@
+package market.guess.service.domain;
+
+import market.guess.api.MarketDTO;
+
+public final class Market {
+  private final String key;
+  private final String name;
+
+  private int volume;
+
+  public Market(String key, String name) {
+    super();
+    this.key = key;
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String getKey() {
+    return key;
+  }
+
+  public int getVolume() {
+    return volume;
+  }
+
+  public MarketDTO toMarket() {
+    return new MarketDTO(key, name, "", String.valueOf(volume));
+  }
+}
diff --git a/service/src/main/java/market/guess/service/domain/Option.java b/service/src/main/java/market/guess/service/domain/Option.java
deleted file mode 100644
index 7f2ff86..0000000
--- a/service/src/main/java/market/guess/service/domain/Option.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package market.guess.service.domain;
-
-public final record Option(String key, String name) {}
diff --git a/service/src/main/java/market/guess/service/domain/User.java b/service/src/main/java/market/guess/service/domain/User.java
index b2084b4..3536c4e 100644
--- a/service/src/main/java/market/guess/service/domain/User.java
+++ b/service/src/main/java/market/guess/service/domain/User.java
@@ -1,10 +1,11 @@
 package market.guess.service.domain;
 
 import java.math.BigDecimal;
+import market.guess.service.ledger.Ledger;
 
 public final class User {
   private final String name;
-  private final Account account;
+  private final Ledger account;
 
   public User(String name, int initialBalance) {
     this(name, BigDecimalOptions.toMoney(initialBalance));
@@ -12,14 +13,14 @@ public final class User {
 
   public User(String name, BigDecimal initialBalance) {
     this.name = name;
-    this.account = new Account(name, initialBalance);
+    this.account = new Ledger(name, initialBalance);
   }
 
   public String getName() {
     return name;
   }
 
-  public Account getAccount() {
+  public Ledger getLedger() {
     return account;
   }
 }
diff --git a/service/src/main/java/market/guess/service/infrastructure/MarketContext.java b/service/src/main/java/market/guess/service/infrastructure/MarketContext.java
index e769384..d9fe3f8 100644
--- a/service/src/main/java/market/guess/service/infrastructure/MarketContext.java
+++ b/service/src/main/java/market/guess/service/infrastructure/MarketContext.java
@@ -2,16 +2,23 @@ package market.guess.service.infrastructure;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Instant;
+import java.util.List;
+import market.guess.service.domain.Event;
+import market.guess.service.domain.User;
 import market.guess.service.infrastructure.adapter.InstantTypeAdapter;
 import market.guess.service.infrastructure.repository.EventRepository;
 import market.guess.service.infrastructure.repository.UserRepository;
 
 public final class MarketContext {
+  record Wrapper(List<Event> events, List<User> users) {}
+
   private final EventRepository events;
   private final UserRepository users;
 
@@ -39,11 +46,34 @@ public final class MarketContext {
 
     try {
       if (path.getParent() != null) Files.createDirectories(path.getParent());
-      Files.writeString(path, GSON.toJson(events), StandardCharsets.UTF_8);
+      Files.writeString(
+          path,
+          GSON.toJson(new Wrapper(events.getAll(), users.getAll())),
+          StandardCharsets.UTF_8);
     } catch (IOException e) {
 
     }
   }
 
-  public void load() {}
+  public void load() {
+    try {
+      var wrapper =
+          GSON.fromJson(
+              Files.readString(Path.of("test-file.json"), StandardCharsets.UTF_8), Wrapper.class);
+      events.clear();
+      users.clear();
+
+      for (var event : wrapper.events()) {
+        events.add(event);
+      }
+
+      for (var user : wrapper.users()) {
+        users.add(user);
+      }
+
+    } catch (JsonSyntaxException | IOException e) {
+      // TODO Auto-generated catch block
+      e.printStackTrace();
+    }
+  }
 }
diff --git a/service/src/main/java/market/guess/service/infrastructure/mapper/v1/EventMapperV1.java b/service/src/main/java/market/guess/service/infrastructure/mapper/v1/EventMapperV1.java
index 8754555..7984c41 100644
--- a/service/src/main/java/market/guess/service/infrastructure/mapper/v1/EventMapperV1.java
+++ b/service/src/main/java/market/guess/service/infrastructure/mapper/v1/EventMapperV1.java
@@ -5,7 +5,7 @@ import java.util.List;
 import market.guess.api.CommissionTiming;
 import market.guess.api.EventStatus;
 import market.guess.service.domain.Event;
-import market.guess.service.domain.Option;
+import market.guess.service.domain.Market;
 import market.guess.service.infrastructure.mapper.Mapper;
 import market.guess.service.mechanism.LmsrTradingMechanism;
 import market.guess.service.model.v1.GMEvent;
@@ -45,10 +45,10 @@ public final class EventMapperV1 implements Mapper<GMEvent, Event> {
     };
   }
 
-  private static List<Option> getOptions(GMEvent x) {
-    var ret = new ArrayList<Option>(x.getGMOptions().getGMOption().size());
+  private static List<Market> getOptions(GMEvent x) {
+    var ret = new ArrayList<Market>(x.getGMOptions().getGMOption().size());
     for (var i = 0; i < x.getGMOptions().getGMOption().size(); i++) {
-      ret.add(new Option(getEventKey(x) + ":" + i, x.getGMOptions().getGMOption().get(i)));
+      ret.add(new Market(getEventKey(x) + ":" + i, x.getGMOptions().getGMOption().get(i)));
     }
     return ret;
   }
diff --git a/service/src/main/java/market/guess/service/infrastructure/mapper/v2/EventMapperV2.java b/service/src/main/java/market/guess/service/infrastructure/mapper/v2/EventMapperV2.java
index a4fc4e7..0dd8e43 100644
--- a/service/src/main/java/market/guess/service/infrastructure/mapper/v2/EventMapperV2.java
+++ b/service/src/main/java/market/guess/service/infrastructure/mapper/v2/EventMapperV2.java
@@ -5,7 +5,7 @@ import java.util.List;
 import market.guess.api.CommissionTiming;
 import market.guess.api.EventStatus;
 import market.guess.service.domain.Event;
-import market.guess.service.domain.Option;
+import market.guess.service.domain.Market;
 import market.guess.service.infrastructure.mapper.Mapper;
 import market.guess.service.mechanism.LmsrTradingMechanism;
 import market.guess.service.mechanism.OrderBookTradingMechanism;
@@ -28,7 +28,7 @@ public final class EventMapperV2 implements Mapper<GMEvent, Event> {
         source.getCommission().getValue(),
         getTiming(source.getCommission().getType()),
         getMechanism(source, options.size()),
-        EventStatus.NOT_STARTED,
+        EventStatus.DRAFT,
         options,
         "");
   }
@@ -59,10 +59,10 @@ public final class EventMapperV2 implements Mapper<GMEvent, Event> {
     throw new IllegalArgumentException();
   }
 
-  private static List<Option> getOptions(GMEvent x) {
-    var ret = new ArrayList<Option>(x.getGMOptions().getGMOption().size());
+  private static List<Market> getOptions(GMEvent x) {
+    var ret = new ArrayList<Market>(x.getGMOptions().getGMOption().size());
     for (var i = 0; i < x.getGMOptions().getGMOption().size(); i++) {
-      ret.add(new Option(getEventKey(x) + ":" + i, x.getGMOptions().getGMOption().get(i)));
+      ret.add(new Market(getEventKey(x) + ":" + i, x.getGMOptions().getGMOption().get(i)));
     }
     return ret;
   }
diff --git a/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryEventRepository.java b/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryEventRepository.java
index 0ed5b20..8b8eeb2 100644
--- a/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryEventRepository.java
+++ b/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryEventRepository.java
@@ -24,4 +24,9 @@ public final class InMemoryEventRepository implements EventRepository {
   public List<Event> getAll() {
     return Collections.unmodifiableList(events);
   }
+
+  @Override
+  public void clear() {
+    events.clear();
+  }
 }
diff --git a/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryUserRepository.java b/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryUserRepository.java
index b4014e5..b611a77 100644
--- a/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryUserRepository.java
+++ b/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryUserRepository.java
@@ -24,4 +24,9 @@ public final class InMemoryUserRepository implements UserRepository {
   public List<User> getAll() {
     return Collections.unmodifiableList(users);
   }
+
+  @Override
+  public void clear() {
+    users.clear();
+  }
 }
diff --git a/service/src/main/java/market/guess/service/infrastructure/repository/Repository.java b/service/src/main/java/market/guess/service/infrastructure/repository/Repository.java
index 13f3901..41cb578 100644
--- a/service/src/main/java/market/guess/service/infrastructure/repository/Repository.java
+++ b/service/src/main/java/market/guess/service/infrastructure/repository/Repository.java
@@ -9,4 +9,6 @@ public interface Repository<T> {
   Optional<T> get(String id);
 
   List<T> getAll();
+
+  void clear();
 }
diff --git a/service/src/main/java/market/guess/service/ledger/Ledger.java b/service/src/main/java/market/guess/service/ledger/Ledger.java
new file mode 100644
index 0000000..744fde7
--- /dev/null
+++ b/service/src/main/java/market/guess/service/ledger/Ledger.java
@@ -0,0 +1,35 @@
+package market.guess.service.ledger;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import market.guess.service.domain.BigDecimalOptions;
+
+public final class Ledger {
+  private final String owner;
+  private BigDecimal balance;
+  private final List<LedgerEntry> entries = new ArrayList<>();
+
+  public Ledger(String owner, BigDecimal initialBalance) {
+    super();
+    this.owner = owner;
+    this.balance = BigDecimalOptions.toMoney(initialBalance);
+  }
+
+  public String getOwner() {
+    return owner;
+  }
+
+  public BigDecimal getBalance() {
+    return balance;
+  }
+
+  public List<LedgerEntry> getEntries() {
+    return Collections.unmodifiableList(entries);
+  }
+
+  public void record(LedgerEntry entry) {
+    entries.add(entry);
+  }
+}
diff --git a/service/src/main/java/market/guess/service/ledger/LedgerContext.java b/service/src/main/java/market/guess/service/ledger/LedgerContext.java
new file mode 100644
index 0000000..caecf55
--- /dev/null
+++ b/service/src/main/java/market/guess/service/ledger/LedgerContext.java
@@ -0,0 +1,49 @@
+package market.guess.service.ledger;
+
+import java.math.BigDecimal;
+import java.time.Clock;
+import market.guess.api.LedgerType;
+import market.guess.service.infrastructure.repository.UserRepository;
+
+public final class LedgerContext {
+  private final Clock clock;
+  private final UserRepository users;
+
+  private int runningId;
+
+  public LedgerContext(UserRepository users) {
+    this(users, Clock.systemUTC());
+  }
+
+  public LedgerContext(UserRepository users, Clock clock) {
+    super();
+    this.clock = clock;
+    this.users = users;
+  }
+
+  public boolean credit(String name, LedgerType type, BigDecimal amount, String note) {
+    record(name, type, amount, note);
+    return true;
+  }
+
+  public boolean debit(String name, LedgerType type, BigDecimal amount, String note) {
+    record(name, type, amount.negate(), note);
+    return true;
+  }
+
+  private void record(String name, LedgerType type, BigDecimal amount, String note) {
+    users
+        .get(name)
+        .ifPresent(
+            u ->
+                u.getLedger()
+                    .record(
+                        new LedgerEntry(
+                            runningId++,
+                            clock.instant(),
+                            type,
+                            amount,
+                            u.getLedger().getBalance().add(amount),
+                            note)));
+  }
+}
diff --git a/service/src/main/java/market/guess/service/ledger/LedgerEntry.java b/service/src/main/java/market/guess/service/ledger/LedgerEntry.java
new file mode 100644
index 0000000..8008f20
--- /dev/null
+++ b/service/src/main/java/market/guess/service/ledger/LedgerEntry.java
@@ -0,0 +1,13 @@
+package market.guess.service.ledger;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import market.guess.api.LedgerType;
+
+public final record LedgerEntry(
+    int id,
+    Instant time,
+    LedgerType type,
+    BigDecimal amount,
+    BigDecimal balanceAfter,
+    String note) {}
diff --git a/ui-console/src/main/java/market/guess/ui/console/Menu.java b/ui-console/src/main/java/market/guess/ui/console/Menu.java
index 90ddd38..9041590 100644
--- a/ui-console/src/main/java/market/guess/ui/console/Menu.java
+++ b/ui-console/src/main/java/market/guess/ui/console/Menu.java
@@ -20,8 +20,8 @@ public final class Menu implements Startable {
   public void start() {
     var max = commands.stream().mapToInt(MenuCommand::getIndex).max().orElse(0);
     io.splashScreen();
-    while (true) {
 
+    while (true) {
       io.newLine();
       for (var command : commands) {
         io.println("    [%d]->> %s".formatted(command.getIndex(), command.getName()));
diff --git a/ui-console/src/main/java/market/guess/ui/console/command/BuyMenuCommand.java b/ui-console/src/main/java/market/guess/ui/console/command/BuyMenuCommand.java
index b8e2523..df40aa8 100644
--- a/ui-console/src/main/java/market/guess/ui/console/command/BuyMenuCommand.java
+++ b/ui-console/src/main/java/market/guess/ui/console/command/BuyMenuCommand.java
@@ -1,17 +1,19 @@
 package market.guess.ui.console.command;
 
+import market.guess.api.CatalogContext;
 import market.guess.api.EventStatus;
 import market.guess.api.GuessMarketContext;
-import market.guess.exception.GuessMarketException;
 import market.guess.ui.console.io.InputProcessor;
 
 public final class BuyMenuCommand implements MenuCommand {
   private final GuessMarketContext context;
+  private final CatalogContext catalog;
   private final InputProcessor io;
 
-  public BuyMenuCommand(GuessMarketContext context, InputProcessor io) {
+  public BuyMenuCommand(GuessMarketContext context, CatalogContext catalog, InputProcessor io) {
     super();
     this.context = context;
+    this.catalog = catalog;
     this.io = io;
   }
 
@@ -25,50 +27,46 @@ public final class BuyMenuCommand implements MenuCommand {
     return "Buy share(s) in an event";
   }
 
-  @Override
-  public boolean allowed() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'allowed'");
-  }
-
   @Override
   public void execute() {
-    var active =
-        context.listEvents().stream()
-            .filter(event -> event.status() == EventStatus.ACTIVE)
-            .toList();
+    var result = catalog.getAllEvents();
+
+    if (!result.isSuccess()) {
+      io.println("Failed to list events");
+      return;
+    }
+
+    var events = result.getData();
+    var active = events.stream().filter(event -> event.status() == EventStatus.ACTIVE).toList();
 
     if (active.isEmpty()) {
       io.println("There are currently no active events to trade on.");
       return;
     }
 
-    var pick =
-        io.readSelect(
-            "Pick an event: ",
-            active,
-            event -> "[%d] %s".formatted(event.displayId(), event.name()));
-
-    var event = context.getEvent(pick.eventKey());
+    var pick = io.readSelect("Pick an event: ", active, event -> "%s".formatted(event.name()));
 
+    var result2 = catalog.getEvent(pick.key());
+    var event = result2.getData();
     if (event == null) {
       io.println("That event is no longer available.");
       return;
     }
 
-    // TODO: print state
+    io.printState(event.state());
 
-    var option =
+    var market =
         io.readSelect(
-            "Choose an option: ", event.state().options(), o -> "%s [value %d, %d shares helds]");
+            "Choose a market: ",
+            event.state().markets(),
+            o -> "%s [value %d, %d shares helds]".formatted(o.name(), o.price(), o.volume()));
 
     var amount = io.readInt("How many shares? ", 1, Integer.MAX_VALUE);
 
-    try {
-      var receipt = context.buyShares("", option.optionKey(), option.optionKey(), amount);
-    } catch (GuessMarketException e) {
-      io.newLine();
-      io.println("Purchase declined: %s".formatted(e.getMessage()));
-    }
+    var receipt = context.buyShares("", event.summary().key(), market.key(), amount);
+    if (receipt.isSuccess()) return;
+
+    io.newLine();
+    io.println("Purchase declined: %s".formatted(receipt.getMessage()));
   }
 }
diff --git a/ui-console/src/main/java/market/guess/ui/console/command/EventDetailsMenuCommand.java b/ui-console/src/main/java/market/guess/ui/console/command/EventDetailsMenuCommand.java
index e12caeb..ab60a1f 100644
--- a/ui-console/src/main/java/market/guess/ui/console/command/EventDetailsMenuCommand.java
+++ b/ui-console/src/main/java/market/guess/ui/console/command/EventDetailsMenuCommand.java
@@ -12,12 +12,6 @@ public final class EventDetailsMenuCommand implements MenuCommand {
     return "Show event details";
   }
 
-  @Override
-  public boolean allowed() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'allowed'");
-  }
-
   @Override
   public void execute() {
     // TODO Auto-generated method stub
diff --git a/ui-console/src/main/java/market/guess/ui/console/command/ExitMenuCommand.java b/ui-console/src/main/java/market/guess/ui/console/command/ExitMenuCommand.java
index 23ed9c9..4fcc448 100644
--- a/ui-console/src/main/java/market/guess/ui/console/command/ExitMenuCommand.java
+++ b/ui-console/src/main/java/market/guess/ui/console/command/ExitMenuCommand.java
@@ -20,11 +20,6 @@ public final class ExitMenuCommand implements MenuCommand {
     return "Exit";
   }
 
-  @Override
-  public boolean allowed() {
-    return true;
-  }
-
   @Override
   public boolean isExit() {
     return true;
diff --git a/ui-console/src/main/java/market/guess/ui/console/command/ListEventsMenuCommand.java b/ui-console/src/main/java/market/guess/ui/console/command/ListEventsMenuCommand.java
index bad621d..a97ab9f 100644
--- a/ui-console/src/main/java/market/guess/ui/console/command/ListEventsMenuCommand.java
+++ b/ui-console/src/main/java/market/guess/ui/console/command/ListEventsMenuCommand.java
@@ -1,16 +1,16 @@
 package market.guess.ui.console.command;
 
+import market.guess.api.CatalogContext;
 import market.guess.api.CommissionTiming;
-import market.guess.api.GuessMarketContext;
 import market.guess.ui.console.io.InputProcessor;
 
 public final class ListEventsMenuCommand implements MenuCommand {
-  private final GuessMarketContext context;
+  private final CatalogContext catalog;
   private final InputProcessor io;
 
-  public ListEventsMenuCommand(GuessMarketContext context, InputProcessor io) {
+  public ListEventsMenuCommand(CatalogContext catalog, InputProcessor io) {
     super();
-    this.context = context;
+    this.catalog = catalog;
     this.io = io;
   }
 
@@ -24,14 +24,14 @@ public final class ListEventsMenuCommand implements MenuCommand {
     return "List events";
   }
 
-  @Override
-  public boolean allowed() {
-    return !context.listEvents().isEmpty();
-  }
-
   @Override
   public void execute() {
-    var events = context.listEvents();
+    var result = catalog.getAllEvents();
+
+    if (!result.isSuccess()) {
+      return;
+    }
+    var events = result.getData();
 
     for (var event : events) {
       io.newLine();
diff --git a/ui-console/src/main/java/market/guess/ui/console/command/LoadFileMenuCommand.java b/ui-console/src/main/java/market/guess/ui/console/command/LoadFileMenuCommand.java
index 7005632..065ac6e 100644
--- a/ui-console/src/main/java/market/guess/ui/console/command/LoadFileMenuCommand.java
+++ b/ui-console/src/main/java/market/guess/ui/console/command/LoadFileMenuCommand.java
@@ -1,15 +1,15 @@
 package market.guess.ui.console.command;
 
 import java.nio.file.Path;
-import market.guess.api.GuessMarketContext;
+import market.guess.api.CatalogContext;
 import market.guess.ui.console.io.InputProcessor;
 
 public final class LoadFileMenuCommand implements MenuCommand {
-  private final GuessMarketContext context;
+  private final CatalogContext catalog;
   private final InputProcessor io;
 
-  public LoadFileMenuCommand(GuessMarketContext context, InputProcessor io) {
-    this.context = context;
+  public LoadFileMenuCommand(CatalogContext catalog, InputProcessor io) {
+    this.catalog = catalog;
     this.io = io;
   }
 
@@ -23,24 +23,25 @@ public final class LoadFileMenuCommand implements MenuCommand {
     return "Load events from file";
   }
 
-  @Override
-  public boolean allowed() {
-    return true;
-  }
-
   @Override
   public void execute() {
-    var path = io.readPath("Pleae enter the full file path to the XML file: ");
-    var result = context.loadEvents(Path.of(path));
-
-    if (result.success()) {
-      io.println("Loaded %d event(s) from %s.".formatted(result.eventsLoaded(), result.source()));
+    //    var path = io.readPath("Pleae enter the full file path to the XML file: ");
+    //  var result = context.loadEvents(Path.of(path));
+    var result =
+        catalog.loadEvents(
+            Path.of("/home/hex-dev/projects/guess-market/test-data/ex-1/multiple.xml"));
+
+    if (result.isSuccess()) {
+      io.println(
+          "Loaded %d event(s) from %s."
+              .formatted(result.getData().eventsLoaded(), result.getData().source()));
       return;
     }
 
     io.println(
-        "The file was not loaded. %d problem(s) were found: ".formatted(result.issues().size()));
-    for (var issue : result.issues()) {
+        "The file was not loaded. %d problem(s) were found: "
+            .formatted(result.getData().issues().size()));
+    for (var issue : result.getData().issues()) {
       io.println("    - %s: %s".formatted(issue.location(), issue.humanizedMessage()));
     }
   }
diff --git a/ui-console/src/main/java/market/guess/ui/console/command/LoadMarketStateMenuCommand.java b/ui-console/src/main/java/market/guess/ui/console/command/LoadMarketStateMenuCommand.java
index 3111044..defb402 100644
--- a/ui-console/src/main/java/market/guess/ui/console/command/LoadMarketStateMenuCommand.java
+++ b/ui-console/src/main/java/market/guess/ui/console/command/LoadMarketStateMenuCommand.java
@@ -1,6 +1,18 @@
 package market.guess.ui.console.command;
 
+import java.nio.file.Path;
+import market.guess.api.GuessMarketContext;
+import market.guess.ui.console.io.InputProcessor;
+
 public final class LoadMarketStateMenuCommand implements MenuCommand {
+  private final GuessMarketContext context;
+  private final InputProcessor io;
+
+  public LoadMarketStateMenuCommand(GuessMarketContext context, InputProcessor io) {
+    super();
+    this.context = context;
+    this.io = io;
+  }
 
   @Override
   public int getIndex() {
@@ -12,15 +24,13 @@ public final class LoadMarketStateMenuCommand implements MenuCommand {
     return "Load market state";
   }
 
-  @Override
-  public boolean allowed() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'allowed'");
-  }
-
   @Override
   public void execute() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'execute'");
+    var path = io.readPath("Which state file to load? ");
+    var result = context.restoreState(Path.of(path));
+
+    if (result.isSuccess()) {
+      io.println("Restored %d event(s) from %s.".formatted(result.getData().eventsLoaded(), path));
+    }
   }
 }
diff --git a/ui-console/src/main/java/market/guess/ui/console/command/MenuCommand.java b/ui-console/src/main/java/market/guess/ui/console/command/MenuCommand.java
index 50acdac..8d35112 100644
--- a/ui-console/src/main/java/market/guess/ui/console/command/MenuCommand.java
+++ b/ui-console/src/main/java/market/guess/ui/console/command/MenuCommand.java
@@ -5,8 +5,6 @@ public interface MenuCommand {
 
   String getName();
 
-  boolean allowed();
-
   void execute();
 
   default boolean isExit() {
diff --git a/ui-console/src/main/java/market/guess/ui/console/command/SaveMarketStateMenuCommand.java b/ui-console/src/main/java/market/guess/ui/console/command/SaveMarketStateMenuCommand.java
index 2f950f0..27dfdde 100644
--- a/ui-console/src/main/java/market/guess/ui/console/command/SaveMarketStateMenuCommand.java
+++ b/ui-console/src/main/java/market/guess/ui/console/command/SaveMarketStateMenuCommand.java
@@ -24,12 +24,6 @@ public final class SaveMarketStateMenuCommand implements MenuCommand {
     return "Save current state";
   }
 
-  @Override
-  public boolean allowed() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'allowed'");
-  }
-
   @Override
   public void execute() {
     var path = io.readPath("Save to: ");
diff --git a/ui-console/src/main/java/market/guess/ui/console/command/SettleEventMenuCommand.java b/ui-console/src/main/java/market/guess/ui/console/command/SettleEventMenuCommand.java
index 9b62be5..b7344e3 100644
--- a/ui-console/src/main/java/market/guess/ui/console/command/SettleEventMenuCommand.java
+++ b/ui-console/src/main/java/market/guess/ui/console/command/SettleEventMenuCommand.java
@@ -22,12 +22,6 @@ public final class SettleEventMenuCommand implements MenuCommand {
     return "Settle an event";
   }
 
-  @Override
-  public boolean allowed() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'allowed'");
-  }
-
   @Override
   public void execute() {
     // TODO Auto-generated method stub
diff --git a/ui-console/src/main/java/market/guess/ui/console/io/InputProcessor.java b/ui-console/src/main/java/market/guess/ui/console/io/InputProcessor.java
index b6d5405..912ca25 100644
--- a/ui-console/src/main/java/market/guess/ui/console/io/InputProcessor.java
+++ b/ui-console/src/main/java/market/guess/ui/console/io/InputProcessor.java
@@ -3,6 +3,7 @@ package market.guess.ui.console.io;
 import java.util.List;
 import java.util.Scanner;
 import java.util.function.Function;
+import market.guess.api.MarketStateDTO;
 
 public final class InputProcessor {
   private final Scanner scanner = new Scanner(System.in);
@@ -21,14 +22,45 @@ public final class InputProcessor {
 
   public void splashScreen() {
     newLine();
-    IO.println("<<- GUESS MARKET ->>");
+    IO.println(padLeft("<<- GUESS MARKET ->>", 36));
   }
 
-  public void printState() {
-    nextLine();
-    println("    Option   |         Value | Shares ");
-
+  public void printState(MarketStateDTO state) {
+    newLine();
+    println(
+        "%s|%s%s|%s"
+            .formatted(
+                padAround("Option", 18), space(10), padLeft("Value", 8), padRight("Shares", 8)));
+
+    for (var market : state.markets()) {
+      println(
+          "%s|%s%s|%s"
+              .formatted(
+                  padAround(market.name(), 18),
+                  space(10),
+                  padLeft(market.price(), 8),
+                  padRight(market.volume(), 8)));
+    }
     newLine();
+
+    print("Event ledger balance: ".formatted(state.accountBalance()));
+    print("Commission collected: ".formatted(state.commissionCollected()));
+  }
+
+  private static String space(int width) {
+    return " ".repeat(width);
+  }
+
+  private static String padAround(String input, int width) {
+    return input.length() >= width ? input : padRight(padLeft(input, width / 2), width / 2);
+  }
+
+  private static String padRight(String input, int width) {
+    return input.length() >= width ? input : input + " ".repeat(width - input.length());
+  }
+
+  private static String padLeft(String input, int width) {
+    return input.length() >= width ? input : " ".repeat(width - input.length()) + input;
   }
 
   public String readLine(String prompt) {
@@ -92,7 +124,6 @@ public final class InputProcessor {
   }
 
   public <T> T readSelect(String prompt, List<T> items, Function<T, String> function) {
-
     for (var i = 0; i < items.size(); i++) {
       IO.println("   [%d]->> %s".formatted(i + 1, function.apply(items.get(i))));
     }
-- 
cgit v1.2.3