Replace order matching with risk/matching/fulfillment/settlement pipeline

Move XML loading infrastructure and models under service/catalog, and
split order execution into a real pipeline: RiskEngine checks the order,
MatchingEngine matches it, FulfillmentContext books the resulting trades,
and SettlementContext resolves winning markets. GuessMarketContext.buyShares
becomes placeOrder(price, quantity), and TradingMechanism.buy now returns
matched trades directly instead of a single TradeExecution.

84 files changed, 2133 insertions, 2200 deletions

diff --git a/api/src/main/java/market/guess/api/CatalogContext.java b/api/src/main/java/market/guess/api/CatalogContext.java
index c980ba8..413a81c 100644
--- a/api/src/main/java/market/guess/api/CatalogContext.java
+++ b/api/src/main/java/market/guess/api/CatalogContext.java
@@ -6,7 +6,7 @@ import market.guess.model.event.EventDetailDTO;
 import market.guess.model.event.EventSummaryDTO;
 
 public interface CatalogContext {
-  Result<LoadResultDTO> loadEvents(Path path);
+  Result<LoadResult> loadEvents(Path path);
 
   Result<List<EventSummaryDTO>> getAllEvents();
 
@@ -14,5 +14,5 @@ public interface CatalogContext {
 
   Result<Void> saveState(Path path);
 
-  Result<LoadResultDTO> restoreState(Path path);
+  Result<LoadResult> restoreState(Path path);
 }
diff --git a/api/src/main/java/market/guess/api/GuessMarketContext.java b/api/src/main/java/market/guess/api/GuessMarketContext.java
index 7ec7323..e11defb 100644
--- a/api/src/main/java/market/guess/api/GuessMarketContext.java
+++ b/api/src/main/java/market/guess/api/GuessMarketContext.java
@@ -1,10 +1,11 @@
 package market.guess.api;
 
+import java.math.BigDecimal;
 import market.guess.model.event.EventDetailDTO;
 
 public interface GuessMarketContext {
-  Result<PurchaseReceiptDTO> buyShares(
-      String userName, String eventKey, String optionKey, int quantity);
+  Result<PurchaseReceiptDTO> placeOrder(
+      String userName, String eventKey, String optionKey, BigDecimal price, long quantity);
 
   Result<EventDetailDTO> settleEvent(String userName, String eventKey, String winningOptionKey);
 }
diff --git a/api/src/main/java/market/guess/api/LoadResult.java b/api/src/main/java/market/guess/api/LoadResult.java
new file mode 100644
index 0000000..6ffe68d
--- /dev/null
+++ b/api/src/main/java/market/guess/api/LoadResult.java
@@ -0,0 +1,3 @@
+package market.guess.api;
+
+public record LoadResult(String source, int eventsLoaded) {}
diff --git a/api/src/main/java/market/guess/api/LoadResultDTO.java b/api/src/main/java/market/guess/api/LoadResultDTO.java
deleted file mode 100644
index 95c23e7..0000000
--- a/api/src/main/java/market/guess/api/LoadResultDTO.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package market.guess.api;
-
-public record LoadResultDTO(String source, int eventsLoaded) {}
diff --git a/api/src/main/java/market/guess/api/ProblemDTO.java b/api/src/main/java/market/guess/api/ProblemDTO.java
deleted file mode 100644
index 682372b..0000000
--- a/api/src/main/java/market/guess/api/ProblemDTO.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package market.guess.api;
-
-public record ProblemDTO(String code, String humanizedMessage, String location) {}
diff --git a/service/src/main/java/market/guess/service/LocalGuessMarketContext.java b/service/src/main/java/market/guess/service/LocalGuessMarketContext.java
index 3feef6a..29e3f5c 100644
--- a/service/src/main/java/market/guess/service/LocalGuessMarketContext.java
+++ b/service/src/main/java/market/guess/service/LocalGuessMarketContext.java
@@ -1,26 +1,44 @@
 package market.guess.service;
 
+import java.math.BigDecimal;
+import java.time.Instant;
 import market.guess.api.GuessMarketContext;
 import market.guess.api.PurchaseReceiptDTO;
 import market.guess.api.Result;
 import market.guess.api.TradeRowDTO;
 import market.guess.model.event.EventDetailDTO;
-import market.guess.service.infrastructure.MarketContext;
-import market.guess.service.matching.OrderMatchingContext;
+import market.guess.service.catalog.infrastructure.MarketContext;
+import market.guess.service.domain.Order;
+import market.guess.service.fulfillment.FulfillmentContext;
+import market.guess.service.helpers.InstantOptions;
+import market.guess.service.matching.MatchingEngine;
+import market.guess.service.risk.RiskEngine;
+import market.guess.service.settlement.SettlementContext;
 
 public final class LocalGuessMarketContext implements GuessMarketContext {
-  private final OrderMatchingContext orderMatching;
   private final MarketContext context;
+  private final RiskEngine risk;
+  private final MatchingEngine matching;
+  private final FulfillmentContext fulfillment;
+  private final SettlementContext settlement;
 
-  public LocalGuessMarketContext(MarketContext context, OrderMatchingContext orderMatching) {
+  public LocalGuessMarketContext(
+      MarketContext context,
+      RiskEngine risk,
+      MatchingEngine matching,
+      FulfillmentContext fulfillment,
+      SettlementContext settlement) {
     super();
     this.context = context;
-    this.orderMatching = orderMatching;
+    this.risk = risk;
+    this.matching = matching;
+    this.fulfillment = fulfillment;
+    this.settlement = settlement;
   }
 
   @Override
-  public Result<PurchaseReceiptDTO> buyShares(
-      String userName, String eventKey, String optionKey, int quantity) {
+  public Result<PurchaseReceiptDTO> placeOrder(
+      String userName, String eventKey, String optionKey, BigDecimal price, long quantity) {
     var optional = context.getEvents().get(eventKey);
 
     var userOptional = context.getUsers().get(userName);
@@ -30,17 +48,22 @@ public final class LocalGuessMarketContext implements GuessMarketContext {
     var event = optional.get();
     var user = userOptional.get();
     var option = event.getOption(optionKey);
+    var order = new Order(Instant.now(), event, option, price, quantity);
 
-    var trades = orderMatching.submitOrder(user, event, option, quantity);
+    var riskResult = risk.check(user, order);
+    if (!riskResult.isSuccess()) return Result.error(riskResult.getMessage());
+
+    var rawTrades = matching.match(order);
+    var trades = fulfillment.fulfill(user, order, rawTrades);
     return Result.ok(
         new PurchaseReceiptDTO(
             trades.stream()
                 .map(
                     t ->
                         new TradeRowDTO(
-                            t.at().toString(),
-                            t.userName(),
-                            t.optionName(),
+                            InstantOptions.humanize(t.at()),
+                            t.buyerUserName(),
+                            t.marketName(),
                             String.valueOf(t.quantity()),
                             t.totalPaid().toPlainString()))
                 .toList(),
@@ -56,12 +79,14 @@ public final class LocalGuessMarketContext implements GuessMarketContext {
 
     var event = optional.get();
     if (event.canSettle(userName)) {
-
-      var payout = event.getPayout();
+      settlement.settle(event, winningOptionKey);
 
       return Result.ok(
           new EventDetailDTO(
-              event.toEventSummary(), event.toMarketState(), event.getHistory(), ""));
+              event.toEventSummary(),
+              event.toMarketState(),
+              event.getHistory(),
+              event.getWinningOptionKey()));
     }
 
     return Result.error("Couldn't settle event.");
diff --git a/service/src/main/java/market/guess/service/catalog/LocalCatalogContext.java b/service/src/main/java/market/guess/service/catalog/LocalCatalogContext.java
index 6035ce7..7a32e62 100644
--- a/service/src/main/java/market/guess/service/catalog/LocalCatalogContext.java
+++ b/service/src/main/java/market/guess/service/catalog/LocalCatalogContext.java
@@ -3,37 +3,40 @@ package market.guess.service.catalog;
 import java.nio.file.Path;
 import java.util.List;
 import market.guess.api.CatalogContext;
-import market.guess.api.LoadResultDTO;
+import market.guess.api.LoadResult;
 import market.guess.api.Result;
 import market.guess.model.event.EventDetailDTO;
 import market.guess.model.event.EventSummaryDTO;
+import market.guess.service.catalog.infrastructure.MarketContext;
+import market.guess.service.catalog.infrastructure.provider.Loader;
+import market.guess.service.catalog.infrastructure.repository.EventRepository;
 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;
+  private final EventRepository events;
 
-  public LocalCatalogContext(Loader provider, MarketContext context) {
+  public LocalCatalogContext(Loader provider, MarketContext context, EventRepository events) {
     super();
     this.provider = provider;
     this.context = context;
+    this.events = events;
   }
 
   @Override
-  public Result<LoadResultDTO> loadEvents(Path path) {
+  public Result<LoadResult> loadEvents(Path path) {
     return provider.load(path);
   }
 
   @Override
   public Result<List<EventSummaryDTO>> getAllEvents() {
-    return Result.ok(context.getEvents().getAll().stream().map(Event::toEventSummary).toList());
+    return Result.ok(events.getAll().stream().map(Event::toEventSummary).toList());
   }
 
   @Override
   public Result<EventDetailDTO> getEvent(String eventKey) {
-    var optional = context.getEvents().get(eventKey);
+    var optional = events.get(eventKey);
 
     if (optional.isEmpty()) return Result.error("Unable to find event.");
     var event = optional.get();
@@ -53,12 +56,12 @@ public final class LocalCatalogContext implements CatalogContext {
   }
 
   @Override
-  public Result<LoadResultDTO> restoreState(Path path) {
+  public Result<LoadResult> restoreState(Path path) {
     try {
       context.load();
     } catch (Exception e) {
       return Result.error("Failed to load.", e.getMessage());
     }
-    return Result.ok(new LoadResultDTO(path.toString(), context.getEvents().getAll().size()));
+    return Result.ok(new LoadResult(path.toString(), context.getEvents().getAll().size()));
   }
 }
diff --git a/service/src/main/java/market/guess/service/infrastructure/MarketContext.java b/service/src/main/java/market/guess/service/catalog/infrastructure/MarketContext.java
index 7113803..24521ef 100644
--- a/service/src/main/java/market/guess/service/infrastructure/MarketContext.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/MarketContext.java
@@ -1,4 +1,4 @@
-package market.guess.service.infrastructure;
+package market.guess.service.catalog.infrastructure;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -11,11 +11,11 @@ import java.nio.file.Paths;
 import java.time.Instant;
 import java.util.List;
 import market.guess.exception.GuessMarketException;
+import market.guess.service.catalog.infrastructure.adapter.InstantTypeAdapter;
+import market.guess.service.catalog.infrastructure.repository.EventRepository;
+import market.guess.service.catalog.infrastructure.repository.UserRepository;
 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) {}
diff --git a/service/src/main/java/market/guess/service/infrastructure/adapter/InstantTypeAdapter.java b/service/src/main/java/market/guess/service/catalog/infrastructure/adapter/InstantTypeAdapter.java
index bc5ddb0..09af0b3 100644
--- a/service/src/main/java/market/guess/service/infrastructure/adapter/InstantTypeAdapter.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/adapter/InstantTypeAdapter.java
@@ -1,4 +1,4 @@
-package market.guess.service.infrastructure.adapter;
+package market.guess.service.catalog.infrastructure.adapter;
 
 import com.google.gson.*;
 import java.lang.reflect.Type;
diff --git a/service/src/main/java/market/guess/service/infrastructure/mapper/Mapper.java b/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/Mapper.java
index e3c77bf..c6bd5b6 100644
--- a/service/src/main/java/market/guess/service/infrastructure/mapper/Mapper.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/Mapper.java
@@ -1,4 +1,4 @@
-package market.guess.service.infrastructure.mapper;
+package market.guess.service.catalog.infrastructure.mapper;
 
 public interface Mapper<TModel, TDomain> {
   TDomain toDomain(TModel source);
diff --git a/service/src/main/java/market/guess/service/infrastructure/mapper/v1/EventMapperV1.java b/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v1/EventMapperV1.java
index f049a0b..78fd550 100644
--- a/service/src/main/java/market/guess/service/infrastructure/mapper/v1/EventMapperV1.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v1/EventMapperV1.java
@@ -1,14 +1,14 @@
-package market.guess.service.infrastructure.mapper.v1;
+package market.guess.service.catalog.infrastructure.mapper.v1;
 
 import java.util.ArrayList;
 import java.util.List;
 import market.guess.api.CommissionTiming;
 import market.guess.model.event.EventStatus;
+import market.guess.service.catalog.infrastructure.mapper.Mapper;
+import market.guess.service.catalog.model.v1.GMEvent;
 import market.guess.service.domain.Event;
 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;
 
 public final class EventMapperV1 implements Mapper<GMEvent, Event> {
 
@@ -26,7 +26,8 @@ public final class EventMapperV1 implements Mapper<GMEvent, Event> {
         new LmsrTradingMechanism(source.getGMMethod().getGMLMSR().getB(), options.size()),
         EventStatus.ACTIVE,
         options,
-        "");
+        "Tester"); // ponytail: only user in this console app; swap for a real market-maker
+    // concept if multi-user support lands
   }
 
   private static String getEventKey(GMEvent event) {
diff --git a/service/src/main/java/market/guess/service/infrastructure/mapper/v2/EventMapperV2.java b/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v2/EventMapperV2.java
index 7037c02..82455f1 100644
--- a/service/src/main/java/market/guess/service/infrastructure/mapper/v2/EventMapperV2.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v2/EventMapperV2.java
@@ -1,18 +1,18 @@
-package market.guess.service.infrastructure.mapper.v2;
+package market.guess.service.catalog.infrastructure.mapper.v2;
 
 import java.util.ArrayList;
 import java.util.List;
 import market.guess.api.CommissionTiming;
 import market.guess.model.event.EventStatus;
+import market.guess.service.catalog.infrastructure.mapper.Mapper;
+import market.guess.service.catalog.model.v2.GMEvent;
+import market.guess.service.catalog.model.v2.GMLMSR;
+import market.guess.service.catalog.model.v2.GMOrderBook;
 import market.guess.service.domain.Event;
 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;
 import market.guess.service.mechanism.TradingMechanism;
-import market.guess.service.model.v2.GMEvent;
-import market.guess.service.model.v2.GMLMSR;
-import market.guess.service.model.v2.GMOrderBook;
 
 public final class EventMapperV2 implements Mapper<GMEvent, Event> {
 
diff --git a/service/src/main/java/market/guess/service/catalog/infrastructure/provider/Loader.java b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/Loader.java
new file mode 100644
index 0000000..62406bb
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/Loader.java
@@ -0,0 +1,12 @@
+package market.guess.service.catalog.infrastructure.provider;
+
+import java.nio.file.Path;
+import market.guess.api.CatalogContext;
+import market.guess.api.LoadResult;
+import market.guess.api.Result;
+
+public interface Loader {
+  Result<LoadResult> seed(CatalogContext context);
+
+  Result<LoadResult> load(Path path);
+}
diff --git a/service/src/main/java/market/guess/service/infrastructure/provider/v1/XMLLoaderV1.java b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v1/XMLLoaderV1.java
index 412a5d2..67d0b67 100644
--- a/service/src/main/java/market/guess/service/infrastructure/provider/v1/XMLLoaderV1.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/provider/v1/XMLLoaderV1.java
@@ -1,17 +1,18 @@
-package market.guess.service.infrastructure.provider.v1;
+package market.guess.service.catalog.infrastructure.provider.v1;
 
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import market.guess.api.LoadResultDTO;
+import market.guess.api.CatalogContext;
+import market.guess.api.LoadResult;
 import market.guess.api.Result;
+import market.guess.service.catalog.infrastructure.mapper.v1.EventMapperV1;
+import market.guess.service.catalog.infrastructure.provider.Loader;
+import market.guess.service.catalog.infrastructure.repository.EventRepository;
+import market.guess.service.catalog.infrastructure.repository.UserRepository;
+import market.guess.service.catalog.model.v1.GuessMarket;
 import market.guess.service.domain.User;
-import market.guess.service.infrastructure.mapper.v1.EventMapperV1;
-import market.guess.service.infrastructure.provider.Loader;
-import market.guess.service.infrastructure.repository.EventRepository;
-import market.guess.service.infrastructure.repository.UserRepository;
-import market.guess.service.model.v1.GuessMarket;
 
 public final class XMLLoaderV1 implements Loader {
   private final JAXBContext context;
@@ -34,26 +35,29 @@ public final class XMLLoaderV1 implements Loader {
   }
 
   @Override
-  public Result<LoadResultDTO> load(Path path) {
-
+  public Result<LoadResult> load(Path path) {
     if (path.getFileName() == null
         || !path.getFileName().toString().toLowerCase().endsWith(".xml")) {
       return Result.error("NOT_XML", "The file must be an XML.");
     }
 
     try (var stream = Files.newInputStream(path)) {
-
       var doc = (GuessMarket) context.createUnmarshaller().unmarshal(stream);
-
       for (var event : doc.getGMEvents().getGMEvent()) {
         eventRepository.add(mapper.toDomain(event));
       }
 
       userRepository.add(new User("Tester", 9_999_999));
 
-      return Result.ok(new LoadResultDTO(path.toString(), eventRepository.getAll().size()));
+      return Result.ok(new LoadResult(path.toString(), eventRepository.getAll().size()));
     } catch (Exception e) {
       return Result.error("UNREADABLE", "The file could not be read.");
     }
   }
+
+  @Override
+  public Result<LoadResult> seed(CatalogContext context) {
+    // TODO Auto-generated method stub
+    throw new UnsupportedOperationException("Unimplemented method 'seed'");
+  }
 }
diff --git a/service/src/main/java/market/guess/service/infrastructure/repository/EventRepository.java b/service/src/main/java/market/guess/service/catalog/infrastructure/repository/EventRepository.java
index 186695b..be71a49 100644
--- a/service/src/main/java/market/guess/service/infrastructure/repository/EventRepository.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/repository/EventRepository.java
@@ -1,4 +1,4 @@
-package market.guess.service.infrastructure.repository;
+package market.guess.service.catalog.infrastructure.repository;
 
 import market.guess.service.domain.Event;
 
diff --git a/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryEventRepository.java b/service/src/main/java/market/guess/service/catalog/infrastructure/repository/InMemoryEventRepository.java
index 8b8eeb2..96c898b 100644
--- a/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryEventRepository.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/repository/InMemoryEventRepository.java
@@ -1,4 +1,4 @@
-package market.guess.service.infrastructure.repository;
+package market.guess.service.catalog.infrastructure.repository;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryUserRepository.java b/service/src/main/java/market/guess/service/catalog/infrastructure/repository/InMemoryUserRepository.java
index b611a77..a9c0e8d 100644
--- a/service/src/main/java/market/guess/service/infrastructure/repository/InMemoryUserRepository.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/repository/InMemoryUserRepository.java
@@ -1,4 +1,4 @@
-package market.guess.service.infrastructure.repository;
+package market.guess.service.catalog.infrastructure.repository;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/service/src/main/java/market/guess/service/infrastructure/repository/Repository.java b/service/src/main/java/market/guess/service/catalog/infrastructure/repository/Repository.java
index 41cb578..b165b48 100644
--- a/service/src/main/java/market/guess/service/infrastructure/repository/Repository.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/repository/Repository.java
@@ -1,4 +1,4 @@
-package market.guess.service.infrastructure.repository;
+package market.guess.service.catalog.infrastructure.repository;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/service/src/main/java/market/guess/service/infrastructure/repository/UserRepository.java b/service/src/main/java/market/guess/service/catalog/infrastructure/repository/UserRepository.java
index 4f0b0a6..ef9a543 100644
--- a/service/src/main/java/market/guess/service/infrastructure/repository/UserRepository.java
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/repository/UserRepository.java
@@ -1,4 +1,4 @@
-package market.guess.service.infrastructure.repository;
+package market.guess.service.catalog.infrastructure.repository;
 
 import market.guess.service.domain.User;
 
diff --git a/service/src/main/java/market/guess/service/model/v1/Comision.java b/service/src/main/java/market/guess/service/catalog/model/v1/Comision.java
index c8a374c..17c7a0b 100644
--- a/service/src/main/java/market/guess/service/model/v1/Comision.java
+++ b/service/src/main/java/market/guess/service/catalog/model/v1/Comision.java
@@ -1,11 +1,10 @@
 //
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
 //
 
-
-package market.guess.service.model.v1;
+package market.guess.service.catalog.model.v1;
 
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
@@ -14,12 +13,11 @@ import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 import jakarta.xml.bind.annotation.XmlValue;
 
-
 /**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
  * <pre>{@code
  * <complexType>
  *   <simpleContent>
@@ -36,59 +34,44 @@ import jakarta.xml.bind.annotation.XmlValue;
  *   </simpleContent>
  * </complexType>
  * }</pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "value"
-})
+@XmlType(
+    name = "",
+    propOrder = {"value"})
 @XmlRootElement(name = "comision")
 public class Comision {
 
-    @XmlValue
-    protected int value;
-    @XmlAttribute(name = "type", required = true)
-    protected String type;
+  @XmlValue protected int value;
 
-    /**
-     * Gets the value of the value property.
-     * 
-     */
-    public int getValue() {
-        return value;
-    }
+  @XmlAttribute(name = "type", required = true)
+  protected String type;
 
-    /**
-     * Sets the value of the value property.
-     * 
-     */
-    public void setValue(int value) {
-        this.value = value;
-    }
+  /** Gets the value of the value property. */
+  public int getValue() {
+    return value;
+  }
 
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
+  /** Sets the value of the value property. */
+  public void setValue(int value) {
+    this.value = value;
+  }
 
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
+  /**
+   * Gets the value of the type property.
+   *
+   * @return possible object is {@link String }
+   */
+  public String getType() {
+    return type;
+  }
 
+  /**
+   * Sets the value of the type property.
+   *
+   * @param value allowed object is {@link String }
+   */
+  public void setType(String value) {
+    this.type = value;
+  }
 }
diff --git a/service/src/main/java/market/guess/service/catalog/model/v1/GMEvent.java b/service/src/main/java/market/guess/service/catalog/model/v1/GMEvent.java
new file mode 100644
index 0000000..0b829c5
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v1/GMEvent.java
@@ -0,0 +1,173 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v1;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}id"/>
+ *         <element ref="{}description"/>
+ *         <element ref="{}comision"/>
+ *         <element ref="{}GM-options"/>
+ *         <element ref="{}GM-method"/>
+ *       </sequence>
+ *       <attribute name="name" use="required">
+ *         <simpleType>
+ *           <list itemType="{http://www.w3.org/2001/XMLSchema}string" />
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {"id", "description", "comision", "gmOptions", "gmMethod"})
+@XmlRootElement(name = "GM-event")
+public class GMEvent {
+
+  protected int id;
+
+  @XmlElement(required = true)
+  protected String description;
+
+  @XmlElement(required = true)
+  protected Comision comision;
+
+  @XmlElement(name = "GM-options", required = true)
+  protected GMOptions gmOptions;
+
+  @XmlElement(name = "GM-method", required = true)
+  protected GMMethod gmMethod;
+
+  @XmlAttribute(name = "name", required = true)
+  protected List<String> name;
+
+  /** Gets the value of the id property. */
+  public int getId() {
+    return id;
+  }
+
+  /** Sets the value of the id property. */
+  public void setId(int value) {
+    this.id = value;
+  }
+
+  /**
+   * Gets the value of the description property.
+   *
+   * @return possible object is {@link String }
+   */
+  public String getDescription() {
+    return description;
+  }
+
+  /**
+   * Sets the value of the description property.
+   *
+   * @param value allowed object is {@link String }
+   */
+  public void setDescription(String value) {
+    this.description = value;
+  }
+
+  /**
+   * Gets the value of the comision property.
+   *
+   * @return possible object is {@link Comision }
+   */
+  public Comision getComision() {
+    return comision;
+  }
+
+  /**
+   * Sets the value of the comision property.
+   *
+   * @param value allowed object is {@link Comision }
+   */
+  public void setComision(Comision value) {
+    this.comision = value;
+  }
+
+  /**
+   * Gets the value of the gmOptions property.
+   *
+   * @return possible object is {@link GMOptions }
+   */
+  public GMOptions getGMOptions() {
+    return gmOptions;
+  }
+
+  /**
+   * Sets the value of the gmOptions property.
+   *
+   * @param value allowed object is {@link GMOptions }
+   */
+  public void setGMOptions(GMOptions value) {
+    this.gmOptions = value;
+  }
+
+  /**
+   * Gets the value of the gmMethod property.
+   *
+   * @return possible object is {@link GMMethod }
+   */
+  public GMMethod getGMMethod() {
+    return gmMethod;
+  }
+
+  /**
+   * Sets the value of the gmMethod property.
+   *
+   * @param value allowed object is {@link GMMethod }
+   */
+  public void setGMMethod(GMMethod value) {
+    this.gmMethod = value;
+  }
+
+  /**
+   * Gets the value of the name property.
+   *
+   * <p>This accessor method returns a reference to the live list, not a snapshot. Therefore any
+   * modification you make to the returned list will be present inside the JAXB object. This is why
+   * there is not a <CODE>set</CODE> method for the name property.
+   *
+   * <p>For example, to add a new item, do as follows:
+   *
+   * <pre>
+   * getName().add(newItem);
+   * </pre>
+   *
+   * <p>Objects of the following type(s) are allowed in the list {@link String }
+   *
+   * @return The value of the name property.
+   */
+  public List<String> getName() {
+    if (name == null) {
+      name = new ArrayList<>();
+    }
+    return this.name;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/catalog/model/v1/GMEvents.java b/service/src/main/java/market/guess/service/catalog/model/v1/GMEvents.java
new file mode 100644
index 0000000..b078edd
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v1/GMEvents.java
@@ -0,0 +1,67 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v1;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}GM-event" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {"gmEvent"})
+@XmlRootElement(name = "GM-events")
+public class GMEvents {
+
+  @XmlElement(name = "GM-event", required = true)
+  protected List<GMEvent> gmEvent;
+
+  /**
+   * Gets the value of the gmEvent property.
+   *
+   * <p>This accessor method returns a reference to the live list, not a snapshot. Therefore any
+   * modification you make to the returned list will be present inside the JAXB object. This is why
+   * there is not a <CODE>set</CODE> method for the gmEvent property.
+   *
+   * <p>For example, to add a new item, do as follows:
+   *
+   * <pre>
+   * getGMEvent().add(newItem);
+   * </pre>
+   *
+   * <p>Objects of the following type(s) are allowed in the list {@link GMEvent }
+   *
+   * @return The value of the gmEvent property.
+   */
+  public List<GMEvent> getGMEvent() {
+    if (gmEvent == null) {
+      gmEvent = new ArrayList<>();
+    }
+    return this.gmEvent;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/model/v1/GMLMSR.java b/service/src/main/java/market/guess/service/catalog/model/v1/GMLMSR.java
index a8e90a5..90648e2 100644
--- a/service/src/main/java/market/guess/service/model/v1/GMLMSR.java
+++ b/service/src/main/java/market/guess/service/catalog/model/v1/GMLMSR.java
@@ -1,23 +1,21 @@
 //
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
 //
 
-
-package market.guess.service.model.v1;
+package market.guess.service.catalog.model.v1;
 
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
  * <pre>{@code
  * <complexType>
  *   <complexContent>
@@ -29,32 +27,23 @@ import jakarta.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  * }</pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "b"
-})
+@XmlType(
+    name = "",
+    propOrder = {"b"})
 @XmlRootElement(name = "GM-LMSR")
 public class GMLMSR {
 
-    protected int b;
-
-    /**
-     * Gets the value of the b property.
-     * 
-     */
-    public int getB() {
-        return b;
-    }
+  protected int b;
 
-    /**
-     * Sets the value of the b property.
-     * 
-     */
-    public void setB(int value) {
-        this.b = value;
-    }
+  /** Gets the value of the b property. */
+  public int getB() {
+    return b;
+  }
 
+  /** Sets the value of the b property. */
+  public void setB(int value) {
+    this.b = value;
+  }
 }
diff --git a/service/src/main/java/market/guess/service/model/v1/GMMethod.java b/service/src/main/java/market/guess/service/catalog/model/v1/GMMethod.java
index 867d932..8b73880 100644
--- a/service/src/main/java/market/guess/service/model/v1/GMMethod.java
+++ b/service/src/main/java/market/guess/service/catalog/model/v1/GMMethod.java
@@ -1,11 +1,10 @@
 //
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
 //
 
-
-package market.guess.service.model.v1;
+package market.guess.service.catalog.model.v1;
 
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
@@ -13,12 +12,11 @@ import jakarta.xml.bind.annotation.XmlElement;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
  * <pre>{@code
  * <complexType>
  *   <complexContent>
@@ -30,41 +28,32 @@ import jakarta.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  * }</pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "gmlmsr"
-})
+@XmlType(
+    name = "",
+    propOrder = {"gmlmsr"})
 @XmlRootElement(name = "GM-method")
 public class GMMethod {
 
-    @XmlElement(name = "GM-LMSR", required = true)
-    protected GMLMSR gmlmsr;
-
-    /**
-     * Gets the value of the gmlmsr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMLMSR }
-     *     
-     */
-    public GMLMSR getGMLMSR() {
-        return gmlmsr;
-    }
+  @XmlElement(name = "GM-LMSR", required = true)
+  protected GMLMSR gmlmsr;
 
-    /**
-     * Sets the value of the gmlmsr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMLMSR }
-     *     
-     */
-    public void setGMLMSR(GMLMSR value) {
-        this.gmlmsr = value;
-    }
+  /**
+   * Gets the value of the gmlmsr property.
+   *
+   * @return possible object is {@link GMLMSR }
+   */
+  public GMLMSR getGMLMSR() {
+    return gmlmsr;
+  }
 
+  /**
+   * Sets the value of the gmlmsr property.
+   *
+   * @param value allowed object is {@link GMLMSR }
+   */
+  public void setGMLMSR(GMLMSR value) {
+    this.gmlmsr = value;
+  }
 }
diff --git a/service/src/main/java/market/guess/service/catalog/model/v1/GMOptions.java b/service/src/main/java/market/guess/service/catalog/model/v1/GMOptions.java
new file mode 100644
index 0000000..9639d1c
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v1/GMOptions.java
@@ -0,0 +1,67 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v1;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}GM-option" maxOccurs="2"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {"gmOption"})
+@XmlRootElement(name = "GM-options")
+public class GMOptions {
+
+  @XmlElement(name = "GM-option", required = true)
+  protected List<String> gmOption;
+
+  /**
+   * Gets the value of the gmOption property.
+   *
+   * <p>This accessor method returns a reference to the live list, not a snapshot. Therefore any
+   * modification you make to the returned list will be present inside the JAXB object. This is why
+   * there is not a <CODE>set</CODE> method for the gmOption property.
+   *
+   * <p>For example, to add a new item, do as follows:
+   *
+   * <pre>
+   * getGMOption().add(newItem);
+   * </pre>
+   *
+   * <p>Objects of the following type(s) are allowed in the list {@link String }
+   *
+   * @return The value of the gmOption property.
+   */
+  public List<String> getGMOption() {
+    if (gmOption == null) {
+      gmOption = new ArrayList<>();
+    }
+    return this.gmOption;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/model/v1/GuessMarket.java b/service/src/main/java/market/guess/service/catalog/model/v1/GuessMarket.java
index 43f134d..e584ac2 100644
--- a/service/src/main/java/market/guess/service/model/v1/GuessMarket.java
+++ b/service/src/main/java/market/guess/service/catalog/model/v1/GuessMarket.java
@@ -1,11 +1,10 @@
 //
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
 //
 
-
-package market.guess.service.model.v1;
+package market.guess.service.catalog.model.v1;
 
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
@@ -13,12 +12,11 @@ import jakarta.xml.bind.annotation.XmlElement;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
  * <pre>{@code
  * <complexType>
  *   <complexContent>
@@ -30,41 +28,32 @@ import jakarta.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  * }</pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "gmEvents"
-})
+@XmlType(
+    name = "",
+    propOrder = {"gmEvents"})
 @XmlRootElement(name = "Guess-Market")
 public class GuessMarket {
 
-    @XmlElement(name = "GM-events", required = true)
-    protected GMEvents gmEvents;
-
-    /**
-     * Gets the value of the gmEvents property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMEvents }
-     *     
-     */
-    public GMEvents getGMEvents() {
-        return gmEvents;
-    }
+  @XmlElement(name = "GM-events", required = true)
+  protected GMEvents gmEvents;
 
-    /**
-     * Sets the value of the gmEvents property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMEvents }
-     *     
-     */
-    public void setGMEvents(GMEvents value) {
-        this.gmEvents = value;
-    }
+  /**
+   * Gets the value of the gmEvents property.
+   *
+   * @return possible object is {@link GMEvents }
+   */
+  public GMEvents getGMEvents() {
+    return gmEvents;
+  }
 
+  /**
+   * Sets the value of the gmEvents property.
+   *
+   * @param value allowed object is {@link GMEvents }
+   */
+  public void setGMEvents(GMEvents value) {
+    this.gmEvents = value;
+  }
 }
diff --git a/service/src/main/java/market/guess/service/catalog/model/v1/ObjectFactory.java b/service/src/main/java/market/guess/service/catalog/model/v1/ObjectFactory.java
new file mode 100644
index 0000000..cab68ed
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v1/ObjectFactory.java
@@ -0,0 +1,143 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v1;
+
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each Java content interface and Java element interface
+ * generated in the market.guess.service.model.v1 package.
+ *
+ * <p>An ObjectFactory allows you to programmatically construct new instances of the Java
+ * representation for XML content. The Java representation of XML content can consist of schema
+ * derived interfaces and classes representing the binding of schema type definitions, element
+ * declarations and model groups. Factory methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+  private static final QName _Id_QNAME = new QName("", "id");
+  private static final QName _Description_QNAME = new QName("", "description");
+  private static final QName _B_QNAME = new QName("", "b");
+  private static final QName _GMOption_QNAME = new QName("", "GM-option");
+
+  /**
+   * Create a new ObjectFactory that can be used to create new instances of schema derived classes
+   * for package: market.guess.service.model.v1
+   */
+  public ObjectFactory() {}
+
+  /**
+   * Create an instance of {@link Comision }
+   *
+   * @return the new instance of {@link Comision }
+   */
+  public Comision createComision() {
+    return new Comision();
+  }
+
+  /**
+   * Create an instance of {@link GuessMarket }
+   *
+   * @return the new instance of {@link GuessMarket }
+   */
+  public GuessMarket createGuessMarket() {
+    return new GuessMarket();
+  }
+
+  /**
+   * Create an instance of {@link GMEvents }
+   *
+   * @return the new instance of {@link GMEvents }
+   */
+  public GMEvents createGMEvents() {
+    return new GMEvents();
+  }
+
+  /**
+   * Create an instance of {@link GMEvent }
+   *
+   * @return the new instance of {@link GMEvent }
+   */
+  public GMEvent createGMEvent() {
+    return new GMEvent();
+  }
+
+  /**
+   * Create an instance of {@link GMOptions }
+   *
+   * @return the new instance of {@link GMOptions }
+   */
+  public GMOptions createGMOptions() {
+    return new GMOptions();
+  }
+
+  /**
+   * Create an instance of {@link GMMethod }
+   *
+   * @return the new instance of {@link GMMethod }
+   */
+  public GMMethod createGMMethod() {
+    return new GMMethod();
+  }
+
+  /**
+   * Create an instance of {@link GMLMSR }
+   *
+   * @return the new instance of {@link GMLMSR }
+   */
+  public GMLMSR createGMLMSR() {
+    return new GMLMSR();
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+   *
+   * @param value Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+   */
+  @XmlElementDecl(namespace = "", name = "id")
+  public JAXBElement<Integer> createId(Integer value) {
+    return new JAXBElement<>(_Id_QNAME, Integer.class, null, value);
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+   *
+   * @param value Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+   */
+  @XmlElementDecl(namespace = "", name = "description")
+  public JAXBElement<String> createDescription(String value) {
+    return new JAXBElement<>(_Description_QNAME, String.class, null, value);
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+   *
+   * @param value Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+   */
+  @XmlElementDecl(namespace = "", name = "b")
+  public JAXBElement<Integer> createB(Integer value) {
+    return new JAXBElement<>(_B_QNAME, Integer.class, null, value);
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+   *
+   * @param value Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+   */
+  @XmlElementDecl(namespace = "", name = "GM-option")
+  public JAXBElement<String> createGMOption(String value) {
+    return new JAXBElement<>(_GMOption_QNAME, String.class, null, value);
+  }
+}
diff --git a/service/src/main/java/market/guess/service/model/v2/Commission.java b/service/src/main/java/market/guess/service/catalog/model/v2/Commission.java
index 5448ff0..b46807e 100644
--- a/service/src/main/java/market/guess/service/model/v2/Commission.java
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/Commission.java
@@ -1,11 +1,10 @@
 //
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
 //
 
-
-package market.guess.service.model.v2;
+package market.guess.service.catalog.model.v2;
 
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
@@ -14,12 +13,11 @@ import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 import jakarta.xml.bind.annotation.XmlValue;
 
-
 /**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
  * <pre>{@code
  * <complexType>
  *   <simpleContent>
@@ -36,59 +34,44 @@ import jakarta.xml.bind.annotation.XmlValue;
  *   </simpleContent>
  * </complexType>
  * }</pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "value"
-})
+@XmlType(
+    name = "",
+    propOrder = {"value"})
 @XmlRootElement(name = "commission")
 public class Commission {
 
-    @XmlValue
-    protected int value;
-    @XmlAttribute(name = "type", required = true)
-    protected String type;
+  @XmlValue protected int value;
 
-    /**
-     * Gets the value of the value property.
-     * 
-     */
-    public int getValue() {
-        return value;
-    }
+  @XmlAttribute(name = "type", required = true)
+  protected String type;
 
-    /**
-     * Sets the value of the value property.
-     * 
-     */
-    public void setValue(int value) {
-        this.value = value;
-    }
+  /** Gets the value of the value property. */
+  public int getValue() {
+    return value;
+  }
 
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
+  /** Sets the value of the value property. */
+  public void setValue(int value) {
+    this.value = value;
+  }
 
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
+  /**
+   * Gets the value of the type property.
+   *
+   * @return possible object is {@link String }
+   */
+  public String getType() {
+    return type;
+  }
 
+  /**
+   * Sets the value of the type property.
+   *
+   * @param value allowed object is {@link String }
+   */
+  public void setType(String value) {
+    this.type = value;
+  }
 }
diff --git a/service/src/main/java/market/guess/service/model/v2/Event.java b/service/src/main/java/market/guess/service/catalog/model/v2/Event.java
index 53ca4ca..afd7a32 100644
--- a/service/src/main/java/market/guess/service/model/v2/Event.java
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/Event.java
@@ -1,11 +1,10 @@
 //
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
 //
 
-
-package market.guess.service.model.v2;
+package market.guess.service.catalog.model.v2;
 
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
@@ -13,12 +12,11 @@ import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
  * <pre>{@code
  * <complexType>
  *   <complexContent>
@@ -28,31 +26,22 @@ import jakarta.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  * }</pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
 @XmlRootElement(name = "event")
 public class Event {
 
-    @XmlAttribute(name = "id", required = true)
-    protected int id;
-
-    /**
-     * Gets the value of the id property.
-     * 
-     */
-    public int getId() {
-        return id;
-    }
+  @XmlAttribute(name = "id", required = true)
+  protected int id;
 
-    /**
-     * Sets the value of the id property.
-     * 
-     */
-    public void setId(int value) {
-        this.id = value;
-    }
+  /** Gets the value of the id property. */
+  public int getId() {
+    return id;
+  }
 
+  /** Sets the value of the id property. */
+  public void setId(int value) {
+    this.id = value;
+  }
 }
diff --git a/service/src/main/java/market/guess/service/catalog/model/v2/GMEvent.java b/service/src/main/java/market/guess/service/catalog/model/v2/GMEvent.java
new file mode 100644
index 0000000..3ce6192
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/GMEvent.java
@@ -0,0 +1,161 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}id"/>
+ *         <element ref="{}description"/>
+ *         <element ref="{}commission"/>
+ *         <element ref="{}GM-options"/>
+ *         <element ref="{}GM-method"/>
+ *       </sequence>
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {"id", "description", "commission", "gmOptions", "gmMethod"})
+@XmlRootElement(name = "GM-event")
+public class GMEvent {
+
+  protected int id;
+
+  @XmlElement(required = true)
+  protected String description;
+
+  @XmlElement(required = true)
+  protected Commission commission;
+
+  @XmlElement(name = "GM-options", required = true)
+  protected GMOptions gmOptions;
+
+  @XmlElement(name = "GM-method", required = true)
+  protected GMMethod gmMethod;
+
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
+
+  /** Gets the value of the id property. */
+  public int getId() {
+    return id;
+  }
+
+  /** Sets the value of the id property. */
+  public void setId(int value) {
+    this.id = value;
+  }
+
+  /**
+   * Gets the value of the description property.
+   *
+   * @return possible object is {@link String }
+   */
+  public String getDescription() {
+    return description;
+  }
+
+  /**
+   * Sets the value of the description property.
+   *
+   * @param value allowed object is {@link String }
+   */
+  public void setDescription(String value) {
+    this.description = value;
+  }
+
+  /**
+   * Gets the value of the commission property.
+   *
+   * @return possible object is {@link Commission }
+   */
+  public Commission getCommission() {
+    return commission;
+  }
+
+  /**
+   * Sets the value of the commission property.
+   *
+   * @param value allowed object is {@link Commission }
+   */
+  public void setCommission(Commission value) {
+    this.commission = value;
+  }
+
+  /**
+   * Gets the value of the gmOptions property.
+   *
+   * @return possible object is {@link GMOptions }
+   */
+  public GMOptions getGMOptions() {
+    return gmOptions;
+  }
+
+  /**
+   * Sets the value of the gmOptions property.
+   *
+   * @param value allowed object is {@link GMOptions }
+   */
+  public void setGMOptions(GMOptions value) {
+    this.gmOptions = value;
+  }
+
+  /**
+   * Gets the value of the gmMethod property.
+   *
+   * @return possible object is {@link GMMethod }
+   */
+  public GMMethod getGMMethod() {
+    return gmMethod;
+  }
+
+  /**
+   * Sets the value of the gmMethod property.
+   *
+   * @param value allowed object is {@link GMMethod }
+   */
+  public void setGMMethod(GMMethod value) {
+    this.gmMethod = value;
+  }
+
+  /**
+   * Gets the value of the name property.
+   *
+   * @return possible object is {@link String }
+   */
+  public String getName() {
+    return name;
+  }
+
+  /**
+   * Sets the value of the name property.
+   *
+   * @param value allowed object is {@link String }
+   */
+  public void setName(String value) {
+    this.name = value;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/catalog/model/v2/GMEvents.java b/service/src/main/java/market/guess/service/catalog/model/v2/GMEvents.java
new file mode 100644
index 0000000..365161e
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/GMEvents.java
@@ -0,0 +1,67 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}GM-event" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {"gmEvent"})
+@XmlRootElement(name = "GM-events")
+public class GMEvents {
+
+  @XmlElement(name = "GM-event", required = true)
+  protected List<GMEvent> gmEvent;
+
+  /**
+   * Gets the value of the gmEvent property.
+   *
+   * <p>This accessor method returns a reference to the live list, not a snapshot. Therefore any
+   * modification you make to the returned list will be present inside the JAXB object. This is why
+   * there is not a <CODE>set</CODE> method for the gmEvent property.
+   *
+   * <p>For example, to add a new item, do as follows:
+   *
+   * <pre>
+   * getGMEvent().add(newItem);
+   * </pre>
+   *
+   * <p>Objects of the following type(s) are allowed in the list {@link GMEvent }
+   *
+   * @return The value of the gmEvent property.
+   */
+  public List<GMEvent> getGMEvent() {
+    if (gmEvent == null) {
+      gmEvent = new ArrayList<>();
+    }
+    return this.gmEvent;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/model/v2/GMLMSR.java b/service/src/main/java/market/guess/service/catalog/model/v2/GMLMSR.java
index b299a19..aabd77a 100644
--- a/service/src/main/java/market/guess/service/model/v2/GMLMSR.java
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/GMLMSR.java
@@ -1,23 +1,21 @@
 //
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
 //
 
-
-package market.guess.service.model.v2;
+package market.guess.service.catalog.model.v2;
 
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
  * <pre>{@code
  * <complexType>
  *   <complexContent>
@@ -29,32 +27,23 @@ import jakarta.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  * }</pre>
- * 
- * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "b"
-})
+@XmlType(
+    name = "",
+    propOrder = {"b"})
 @XmlRootElement(name = "GM-LMSR")
 public class GMLMSR {
 
-    protected int b;
-
-    /**
-     * Gets the value of the b property.
-     * 
-     */
-    public int getB() {
-        return b;
-    }
+  protected int b;
 
-    /**
-     * Sets the value of the b property.
-     * 
-     */
-    public void setB(int value) {
-        this.b = value;
-    }
+  /** Gets the value of the b property. */
+  public int getB() {
+    return b;
+  }
 
+  /** Sets the value of the b property. */
+  public void setB(int value) {
+    this.b = value;
+  }
 }
diff --git a/service/src/main/java/market/guess/service/catalog/model/v2/GMMarketMaker.java b/service/src/main/java/market/guess/service/catalog/model/v2/GMMarketMaker.java
new file mode 100644
index 0000000..886f3f0
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/GMMarketMaker.java
@@ -0,0 +1,67 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}event" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {"event"})
+@XmlRootElement(name = "GM-market-maker")
+public class GMMarketMaker {
+
+  @XmlElement(required = true)
+  protected List<Event> event;
+
+  /**
+   * Gets the value of the event property.
+   *
+   * <p>This accessor method returns a reference to the live list, not a snapshot. Therefore any
+   * modification you make to the returned list will be present inside the JAXB object. This is why
+   * there is not a <CODE>set</CODE> method for the event property.
+   *
+   * <p>For example, to add a new item, do as follows:
+   *
+   * <pre>
+   * getEvent().add(newItem);
+   * </pre>
+   *
+   * <p>Objects of the following type(s) are allowed in the list {@link Event }
+   *
+   * @return The value of the event property.
+   */
+  public List<Event> getEvent() {
+    if (event == null) {
+      event = new ArrayList<>();
+    }
+    return this.event;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/catalog/model/v2/GMMethod.java b/service/src/main/java/market/guess/service/catalog/model/v2/GMMethod.java
new file mode 100644
index 0000000..c9a4489
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/GMMethod.java
@@ -0,0 +1,81 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{}GM-LMSR"/>
+ *         <element ref="{}GM-order-book"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {"gmlmsr", "gmOrderBook"})
+@XmlRootElement(name = "GM-method")
+public class GMMethod {
+
+  @XmlElement(name = "GM-LMSR")
+  protected GMLMSR gmlmsr;
+
+  @XmlElement(name = "GM-order-book")
+  protected GMOrderBook gmOrderBook;
+
+  /**
+   * Gets the value of the gmlmsr property.
+   *
+   * @return possible object is {@link GMLMSR }
+   */
+  public GMLMSR getGMLMSR() {
+    return gmlmsr;
+  }
+
+  /**
+   * Sets the value of the gmlmsr property.
+   *
+   * @param value allowed object is {@link GMLMSR }
+   */
+  public void setGMLMSR(GMLMSR value) {
+    this.gmlmsr = value;
+  }
+
+  /**
+   * Gets the value of the gmOrderBook property.
+   *
+   * @return possible object is {@link GMOrderBook }
+   */
+  public GMOrderBook getGMOrderBook() {
+    return gmOrderBook;
+  }
+
+  /**
+   * Sets the value of the gmOrderBook property.
+   *
+   * @param value allowed object is {@link GMOrderBook }
+   */
+  public void setGMOrderBook(GMOrderBook value) {
+    this.gmOrderBook = value;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/catalog/model/v2/GMOptions.java b/service/src/main/java/market/guess/service/catalog/model/v2/GMOptions.java
new file mode 100644
index 0000000..ca0bbb2
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/GMOptions.java
@@ -0,0 +1,67 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}GM-option" maxOccurs="2"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {"gmOption"})
+@XmlRootElement(name = "GM-options")
+public class GMOptions {
+
+  @XmlElement(name = "GM-option", required = true)
+  protected List<String> gmOption;
+
+  /**
+   * Gets the value of the gmOption property.
+   *
+   * <p>This accessor method returns a reference to the live list, not a snapshot. Therefore any
+   * modification you make to the returned list will be present inside the JAXB object. This is why
+   * there is not a <CODE>set</CODE> method for the gmOption property.
+   *
+   * <p>For example, to add a new item, do as follows:
+   *
+   * <pre>
+   * getGMOption().add(newItem);
+   * </pre>
+   *
+   * <p>Objects of the following type(s) are allowed in the list {@link String }
+   *
+   * @return The value of the gmOption property.
+   */
+  public List<String> getGMOption() {
+    if (gmOption == null) {
+      gmOption = new ArrayList<>();
+    }
+    return this.gmOption;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/catalog/model/v2/GMOrderBook.java b/service/src/main/java/market/guess/service/catalog/model/v2/GMOrderBook.java
new file mode 100644
index 0000000..9d3836f
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/GMOrderBook.java
@@ -0,0 +1,90 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="initial" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       <attribute name="d" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       <attribute name="allow-mint" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="false"/>
+ *             <enumeration value="true"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "GM-order-book")
+public class GMOrderBook {
+
+  @XmlAttribute(name = "initial", required = true)
+  protected int initial;
+
+  @XmlAttribute(name = "d", required = true)
+  protected int d;
+
+  @XmlAttribute(name = "allow-mint", required = true)
+  protected String allowMint;
+
+  /** Gets the value of the initial property. */
+  public int getInitial() {
+    return initial;
+  }
+
+  /** Sets the value of the initial property. */
+  public void setInitial(int value) {
+    this.initial = value;
+  }
+
+  /** Gets the value of the d property. */
+  public int getD() {
+    return d;
+  }
+
+  /** Sets the value of the d property. */
+  public void setD(int value) {
+    this.d = value;
+  }
+
+  /**
+   * Gets the value of the allowMint property.
+   *
+   * @return possible object is {@link String }
+   */
+  public String getAllowMint() {
+    return allowMint;
+  }
+
+  /**
+   * Sets the value of the allowMint property.
+   *
+   * @param value allowed object is {@link String }
+   */
+  public void setAllowMint(String value) {
+    this.allowMint = value;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/catalog/model/v2/GMUser.java b/service/src/main/java/market/guess/service/catalog/model/v2/GMUser.java
new file mode 100644
index 0000000..bc6e5d9
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/GMUser.java
@@ -0,0 +1,96 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}initial-cash"/>
+ *         <element ref="{}GM-market-maker" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {"initialCash", "gmMarketMaker"})
+@XmlRootElement(name = "GM-user")
+public class GMUser {
+
+  @XmlElement(name = "initial-cash")
+  protected int initialCash;
+
+  @XmlElement(name = "GM-market-maker")
+  protected GMMarketMaker gmMarketMaker;
+
+  @XmlAttribute(name = "name", required = true)
+  protected String name;
+
+  /** Gets the value of the initialCash property. */
+  public int getInitialCash() {
+    return initialCash;
+  }
+
+  /** Sets the value of the initialCash property. */
+  public void setInitialCash(int value) {
+    this.initialCash = value;
+  }
+
+  /**
+   * Gets the value of the gmMarketMaker property.
+   *
+   * @return possible object is {@link GMMarketMaker }
+   */
+  public GMMarketMaker getGMMarketMaker() {
+    return gmMarketMaker;
+  }
+
+  /**
+   * Sets the value of the gmMarketMaker property.
+   *
+   * @param value allowed object is {@link GMMarketMaker }
+   */
+  public void setGMMarketMaker(GMMarketMaker value) {
+    this.gmMarketMaker = value;
+  }
+
+  /**
+   * Gets the value of the name property.
+   *
+   * @return possible object is {@link String }
+   */
+  public String getName() {
+    return name;
+  }
+
+  /**
+   * Sets the value of the name property.
+   *
+   * @param value allowed object is {@link String }
+   */
+  public void setName(String value) {
+    this.name = value;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/catalog/model/v2/GMUsers.java b/service/src/main/java/market/guess/service/catalog/model/v2/GMUsers.java
new file mode 100644
index 0000000..cc6c81d
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/GMUsers.java
@@ -0,0 +1,67 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}GM-user" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {"gmUser"})
+@XmlRootElement(name = "GM-users")
+public class GMUsers {
+
+  @XmlElement(name = "GM-user", required = true)
+  protected List<GMUser> gmUser;
+
+  /**
+   * Gets the value of the gmUser property.
+   *
+   * <p>This accessor method returns a reference to the live list, not a snapshot. Therefore any
+   * modification you make to the returned list will be present inside the JAXB object. This is why
+   * there is not a <CODE>set</CODE> method for the gmUser property.
+   *
+   * <p>For example, to add a new item, do as follows:
+   *
+   * <pre>
+   * getGMUser().add(newItem);
+   * </pre>
+   *
+   * <p>Objects of the following type(s) are allowed in the list {@link GMUser }
+   *
+   * @return The value of the gmUser property.
+   */
+  public List<GMUser> getGMUser() {
+    if (gmUser == null) {
+      gmUser = new ArrayList<>();
+    }
+    return this.gmUser;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/catalog/model/v2/GuessMarket.java b/service/src/main/java/market/guess/service/catalog/model/v2/GuessMarket.java
new file mode 100644
index 0000000..e312651
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/GuessMarket.java
@@ -0,0 +1,81 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+/**
+ * Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>{@code
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <all>
+ *         <element ref="{}GM-events"/>
+ *         <element ref="{}GM-users"/>
+ *       </all>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * }</pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+    name = "",
+    propOrder = {})
+@XmlRootElement(name = "Guess-Market")
+public class GuessMarket {
+
+  @XmlElement(name = "GM-events", required = true)
+  protected GMEvents gmEvents;
+
+  @XmlElement(name = "GM-users", required = true)
+  protected GMUsers gmUsers;
+
+  /**
+   * Gets the value of the gmEvents property.
+   *
+   * @return possible object is {@link GMEvents }
+   */
+  public GMEvents getGMEvents() {
+    return gmEvents;
+  }
+
+  /**
+   * Sets the value of the gmEvents property.
+   *
+   * @param value allowed object is {@link GMEvents }
+   */
+  public void setGMEvents(GMEvents value) {
+    this.gmEvents = value;
+  }
+
+  /**
+   * Gets the value of the gmUsers property.
+   *
+   * @return possible object is {@link GMUsers }
+   */
+  public GMUsers getGMUsers() {
+    return gmUsers;
+  }
+
+  /**
+   * Sets the value of the gmUsers property.
+   *
+   * @param value allowed object is {@link GMUsers }
+   */
+  public void setGMUsers(GMUsers value) {
+    this.gmUsers = value;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/catalog/model/v2/ObjectFactory.java b/service/src/main/java/market/guess/service/catalog/model/v2/ObjectFactory.java
new file mode 100644
index 0000000..5a20f54
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/model/v2/ObjectFactory.java
@@ -0,0 +1,200 @@
+//
+// This file was generated by the Eclipse Implementation of JAXB, v4.0.5
+// See https://eclipse-ee4j.github.io/jaxb-ri
+// Any modifications to this file will be lost upon recompilation of the source schema.
+//
+
+package market.guess.service.catalog.model.v2;
+
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each Java content interface and Java element interface
+ * generated in the market.guess.service.model.v2 package.
+ *
+ * <p>An ObjectFactory allows you to programmatically construct new instances of the Java
+ * representation for XML content. The Java representation of XML content can consist of schema
+ * derived interfaces and classes representing the binding of schema type definitions, element
+ * declarations and model groups. Factory methods for each of these are provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+  private static final QName _InitialCash_QNAME = new QName("", "initial-cash");
+  private static final QName _Id_QNAME = new QName("", "id");
+  private static final QName _Description_QNAME = new QName("", "description");
+  private static final QName _B_QNAME = new QName("", "b");
+  private static final QName _GMOption_QNAME = new QName("", "GM-option");
+
+  /**
+   * Create a new ObjectFactory that can be used to create new instances of schema derived classes
+   * for package: market.guess.service.model.v2
+   */
+  public ObjectFactory() {}
+
+  /**
+   * Create an instance of {@link Event }
+   *
+   * @return the new instance of {@link Event }
+   */
+  public Event createEvent() {
+    return new Event();
+  }
+
+  /**
+   * Create an instance of {@link Commission }
+   *
+   * @return the new instance of {@link Commission }
+   */
+  public Commission createCommission() {
+    return new Commission();
+  }
+
+  /**
+   * Create an instance of {@link GuessMarket }
+   *
+   * @return the new instance of {@link GuessMarket }
+   */
+  public GuessMarket createGuessMarket() {
+    return new GuessMarket();
+  }
+
+  /**
+   * Create an instance of {@link GMEvents }
+   *
+   * @return the new instance of {@link GMEvents }
+   */
+  public GMEvents createGMEvents() {
+    return new GMEvents();
+  }
+
+  /**
+   * Create an instance of {@link GMEvent }
+   *
+   * @return the new instance of {@link GMEvent }
+   */
+  public GMEvent createGMEvent() {
+    return new GMEvent();
+  }
+
+  /**
+   * Create an instance of {@link GMOptions }
+   *
+   * @return the new instance of {@link GMOptions }
+   */
+  public GMOptions createGMOptions() {
+    return new GMOptions();
+  }
+
+  /**
+   * Create an instance of {@link GMMethod }
+   *
+   * @return the new instance of {@link GMMethod }
+   */
+  public GMMethod createGMMethod() {
+    return new GMMethod();
+  }
+
+  /**
+   * Create an instance of {@link GMLMSR }
+   *
+   * @return the new instance of {@link GMLMSR }
+   */
+  public GMLMSR createGMLMSR() {
+    return new GMLMSR();
+  }
+
+  /**
+   * Create an instance of {@link GMOrderBook }
+   *
+   * @return the new instance of {@link GMOrderBook }
+   */
+  public GMOrderBook createGMOrderBook() {
+    return new GMOrderBook();
+  }
+
+  /**
+   * Create an instance of {@link GMUsers }
+   *
+   * @return the new instance of {@link GMUsers }
+   */
+  public GMUsers createGMUsers() {
+    return new GMUsers();
+  }
+
+  /**
+   * Create an instance of {@link GMUser }
+   *
+   * @return the new instance of {@link GMUser }
+   */
+  public GMUser createGMUser() {
+    return new GMUser();
+  }
+
+  /**
+   * Create an instance of {@link GMMarketMaker }
+   *
+   * @return the new instance of {@link GMMarketMaker }
+   */
+  public GMMarketMaker createGMMarketMaker() {
+    return new GMMarketMaker();
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+   *
+   * @param value Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+   */
+  @XmlElementDecl(namespace = "", name = "initial-cash")
+  public JAXBElement<Integer> createInitialCash(Integer value) {
+    return new JAXBElement<>(_InitialCash_QNAME, Integer.class, null, value);
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+   *
+   * @param value Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+   */
+  @XmlElementDecl(namespace = "", name = "id")
+  public JAXBElement<Integer> createId(Integer value) {
+    return new JAXBElement<>(_Id_QNAME, Integer.class, null, value);
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+   *
+   * @param value Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+   */
+  @XmlElementDecl(namespace = "", name = "description")
+  public JAXBElement<String> createDescription(String value) {
+    return new JAXBElement<>(_Description_QNAME, String.class, null, value);
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+   *
+   * @param value Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+   */
+  @XmlElementDecl(namespace = "", name = "b")
+  public JAXBElement<Integer> createB(Integer value) {
+    return new JAXBElement<>(_B_QNAME, Integer.class, null, value);
+  }
+
+  /**
+   * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+   *
+   * @param value Java instance representing xml element's value.
+   * @return the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+   */
+  @XmlElementDecl(namespace = "", name = "GM-option")
+  public JAXBElement<String> createGMOption(String value) {
+    return new JAXBElement<>(_GMOption_QNAME, String.class, null, value);
+  }
+}
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 943328a..6089aa3 100644
--- a/service/src/main/java/market/guess/service/domain/Event.java
+++ b/service/src/main/java/market/guess/service/domain/Event.java
@@ -5,10 +5,13 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import market.guess.api.CommissionTiming;
+import market.guess.api.MarketDTO;
 import market.guess.api.MarketStateDTO;
 import market.guess.api.TradeRowDTO;
 import market.guess.model.event.EventStatus;
 import market.guess.model.event.EventSummaryDTO;
+import market.guess.service.helpers.BigDecimalOptions;
+import market.guess.service.helpers.InstantOptions;
 import market.guess.service.ledger.Ledger;
 import market.guess.service.mechanism.TradingMechanism;
 
@@ -54,6 +57,10 @@ public final class Event {
     this.state = status;
   }
 
+  public TradingMechanism getMechanism() {
+    return mechanism;
+  }
+
   public String getEventKey() {
     return eventKey;
   }
@@ -118,7 +125,7 @@ public final class Event {
       Instant time,
       String user,
       Market option,
-      int quantity,
+      long quantity,
       BigDecimal cost,
       BigDecimal commission) {
     var trade =
@@ -131,7 +138,7 @@ public final class Event {
 
   public BigDecimal tradeVolumeOf(String option) {
     return trades.stream()
-        .filter(trade -> trade.optionKey().equalsIgnoreCase(option))
+        .filter(trade -> trade.marketKey().equalsIgnoreCase(option))
         .map(Trade::sharesCost)
         .reduce(BigDecimalOptions.ZERO_MONEY, BigDecimal::add);
   }
@@ -148,9 +155,9 @@ public final class Event {
     for (var trade : trades.reversed()) {
       history.add(
           new TradeRowDTO(
-              trade.at().toString(),
-              trade.userName(),
-              trade.optionName(),
+              InstantOptions.humanize(trade.at()),
+              trade.buyerUserName(),
+              trade.marketName(),
               String.valueOf(trade.quantity()),
               trade.sharesCost().toPlainString()));
     }
@@ -172,12 +179,18 @@ public final class Event {
   }
 
   public MarketStateDTO toMarketState() {
+    var prices = mechanism.prices();
+    var marketDTOs = new ArrayList<MarketDTO>();
+    for (var i = 0; i < markets.size(); i++) {
+      marketDTOs.add(markets.get(i).toMarket(prices[i]));
+    }
+
     return new MarketStateDTO(
         eventKey,
         mechanism.getType(),
-        markets.stream().map(Market::toMarket).toList(),
+        marketDTOs,
         String.valueOf(ledger.getBalance()),
-        "");
+        String.valueOf(getCommission()));
   }
 
   public Market getOption(String optionKey) {
@@ -194,8 +207,7 @@ public final class Event {
     return false;
   }
 
-  public BigDecimal getPayout() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'getPayout'");
+  public void addSettlementCommission(BigDecimal amount) {
+    this.settlementCommission = settlementCommission.add(amount);
   }
 }
diff --git a/service/src/main/java/market/guess/service/domain/Market.java b/service/src/main/java/market/guess/service/domain/Market.java
index ce95bae..3ff7e2d 100644
--- a/service/src/main/java/market/guess/service/domain/Market.java
+++ b/service/src/main/java/market/guess/service/domain/Market.java
@@ -1,12 +1,13 @@
 package market.guess.service.domain;
 
+import java.math.BigDecimal;
 import market.guess.api.MarketDTO;
 
 public final class Market {
   private final String key;
   private final String name;
 
-  private int volume;
+  private long volume;
 
   public Market(String key, String name) {
     super();
@@ -22,11 +23,15 @@ public final class Market {
     return key;
   }
 
-  public int getVolume() {
+  public long getVolume() {
     return volume;
   }
 
-  public MarketDTO toMarket() {
-    return new MarketDTO(key, name, "", String.valueOf(volume));
+  public void addVolume(long quantity) {
+    volume += quantity;
+  }
+
+  public MarketDTO toMarket(BigDecimal price) {
+    return new MarketDTO(key, name, price.toPlainString(), String.valueOf(volume));
   }
 }
diff --git a/service/src/main/java/market/guess/service/domain/MarketAction.java b/service/src/main/java/market/guess/service/domain/MarketAction.java
deleted file mode 100644
index d1a0ad5..0000000
--- a/service/src/main/java/market/guess/service/domain/MarketAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package market.guess.service.domain;
-
-public record MarketAction(
-    String kind, String at, String userName, String eventKey, String optionKey, long quantity) {
-
-  public static final String BUY = "BUY";
-  public static final String SELL = "SELL";
-  public static final String SETTLE = "SETTLE";
-
-  public static MarketAction buy(
-      String at, String userName, String eventKey, String optionKey, long quantity) {
-    return new MarketAction(BUY, at, userName, eventKey, optionKey, quantity);
-  }
-
-  public static MarketAction sell(
-      String at, String userName, String eventKey, String optionKey, long quantity) {
-    return new MarketAction(SELL, at, userName, eventKey, optionKey, quantity);
-  }
-
-  public static MarketAction settle(
-      String at, String userName, String eventKey, String winningOptionKey) {
-    return new MarketAction(SETTLE, at, userName, eventKey, winningOptionKey, 0);
-  }
-}
diff --git a/service/src/main/java/market/guess/service/domain/Order.java b/service/src/main/java/market/guess/service/domain/Order.java
new file mode 100644
index 0000000..9d54020
--- /dev/null
+++ b/service/src/main/java/market/guess/service/domain/Order.java
@@ -0,0 +1,6 @@
+package market.guess.service.domain;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+
+public record Order(Instant at, Event event, Market market, BigDecimal price, long quantity) {}
diff --git a/service/src/main/java/market/guess/service/domain/Settlement.java b/service/src/main/java/market/guess/service/domain/Settlement.java
deleted file mode 100644
index cfc61f5..0000000
--- a/service/src/main/java/market/guess/service/domain/Settlement.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package market.guess.service.domain;
-
-import java.math.BigDecimal;
-
-public record Settlement(
-    String winningOption, BigDecimal commission, BigDecimal paidOutToHolders) {}
diff --git a/service/src/main/java/market/guess/service/domain/Trade.java b/service/src/main/java/market/guess/service/domain/Trade.java
index 1211280..271582b 100644
--- a/service/src/main/java/market/guess/service/domain/Trade.java
+++ b/service/src/main/java/market/guess/service/domain/Trade.java
@@ -6,10 +6,10 @@ import java.time.Instant;
 public record Trade(
     int id,
     Instant at,
-    String userName,
-    String optionKey,
-    String optionName,
-    int quantity,
+    String buyerUserName,
+    String marketKey,
+    String marketName,
+    long quantity,
     BigDecimal sharesCost,
     BigDecimal commission) {
 
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 3536c4e..a00b1a0 100644
--- a/service/src/main/java/market/guess/service/domain/User.java
+++ b/service/src/main/java/market/guess/service/domain/User.java
@@ -1,6 +1,7 @@
 package market.guess.service.domain;
 
 import java.math.BigDecimal;
+import market.guess.service.helpers.BigDecimalOptions;
 import market.guess.service.ledger.Ledger;
 
 public final class User {
diff --git a/service/src/main/java/market/guess/service/fulfillment/FulfillmentContext.java b/service/src/main/java/market/guess/service/fulfillment/FulfillmentContext.java
new file mode 100644
index 0000000..d5205e5
--- /dev/null
+++ b/service/src/main/java/market/guess/service/fulfillment/FulfillmentContext.java
@@ -0,0 +1,10 @@
+package market.guess.service.fulfillment;
+
+import java.util.List;
+import market.guess.service.domain.Order;
+import market.guess.service.domain.Trade;
+import market.guess.service.domain.User;
+
+public interface FulfillmentContext {
+  List<Trade> fulfill(User user, Order order, List<Trade> rawTrades);
+}
diff --git a/service/src/main/java/market/guess/service/fulfillment/LocalFulfillmentContext.java b/service/src/main/java/market/guess/service/fulfillment/LocalFulfillmentContext.java
new file mode 100644
index 0000000..64887dc
--- /dev/null
+++ b/service/src/main/java/market/guess/service/fulfillment/LocalFulfillmentContext.java
@@ -0,0 +1,51 @@
+package market.guess.service.fulfillment;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import market.guess.api.CommissionTiming;
+import market.guess.model.ledger.LedgerType;
+import market.guess.service.domain.Order;
+import market.guess.service.domain.Trade;
+import market.guess.service.domain.User;
+import market.guess.service.helpers.BigDecimalOptions;
+import market.guess.service.ledger.LedgerContext;
+
+public final class LocalFulfillmentContext implements FulfillmentContext {
+  private final LedgerContext ledger;
+
+  public LocalFulfillmentContext(LedgerContext ledger) {
+    this.ledger = ledger;
+  }
+
+  @Override
+  public List<Trade> fulfill(User user, Order order, List<Trade> rawTrades) {
+    var event = order.event();
+    var chargeNow = event.getCommissionTiming() == CommissionTiming.ON_PURCHASE;
+    var rate = BigDecimal.valueOf(event.getCommissionPercent()).divide(BigDecimal.valueOf(100));
+
+    var recorded = new ArrayList<Trade>();
+    for (var raw : rawTrades) {
+      var commission =
+          chargeNow
+              ? BigDecimalOptions.toMoney(raw.sharesCost().multiply(rate))
+              : BigDecimalOptions.ZERO_MONEY;
+      var trade =
+          event.recordTrade(
+              order.at(),
+              user.getName(),
+              order.market(),
+              raw.quantity(),
+              raw.sharesCost(),
+              commission);
+      ledger.debit(
+          user.getName(),
+          LedgerType.PURCHASE,
+          trade.totalPaid(),
+          "Purchase: " + order.market().getName());
+      order.market().addVolume(trade.quantity());
+      recorded.add(trade);
+    }
+    return recorded;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/domain/BigDecimalOptions.java b/service/src/main/java/market/guess/service/helpers/BigDecimalOptions.java
index 992e44f..8fcf920 100644
--- a/service/src/main/java/market/guess/service/domain/BigDecimalOptions.java
+++ b/service/src/main/java/market/guess/service/helpers/BigDecimalOptions.java
@@ -1,10 +1,10 @@
-package market.guess.service.domain;
+package market.guess.service.helpers;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
 public record BigDecimalOptions(int scale, RoundingMode roundingMode) {
-  public static final BigDecimalOptions DEFAULT = new BigDecimalOptions(2, RoundingMode.HALF_EVEN);
+  private static final BigDecimalOptions DEFAULT = new BigDecimalOptions(2, RoundingMode.HALF_EVEN);
   public static final BigDecimal ZERO_MONEY =
       BigDecimal.ZERO.setScale(DEFAULT.scale(), DEFAULT.roundingMode());
 
diff --git a/service/src/main/java/market/guess/service/helpers/InstantOptions.java b/service/src/main/java/market/guess/service/helpers/InstantOptions.java
new file mode 100644
index 0000000..3977dcb
--- /dev/null
+++ b/service/src/main/java/market/guess/service/helpers/InstantOptions.java
@@ -0,0 +1,16 @@
+package market.guess.service.helpers;
+
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+public final class InstantOptions {
+  private static final DateTimeFormatter HUMAN =
+      DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
+
+  private InstantOptions() {}
+
+  public static String humanize(Instant instant) {
+    return HUMAN.format(instant);
+  }
+}
diff --git a/service/src/main/java/market/guess/service/infrastructure/provider/Loader.java b/service/src/main/java/market/guess/service/infrastructure/provider/Loader.java
deleted file mode 100644
index fcca92f..0000000
--- a/service/src/main/java/market/guess/service/infrastructure/provider/Loader.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package market.guess.service.infrastructure.provider;
-
-import java.nio.file.Path;
-import market.guess.api.LoadResultDTO;
-import market.guess.api.Result;
-
-public interface Loader {
-  Result<LoadResultDTO> load(Path path);
-}
diff --git a/service/src/main/java/market/guess/service/ledger/Ledger.java b/service/src/main/java/market/guess/service/ledger/Ledger.java
index 744fde7..72bf387 100644
--- a/service/src/main/java/market/guess/service/ledger/Ledger.java
+++ b/service/src/main/java/market/guess/service/ledger/Ledger.java
@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import market.guess.service.domain.BigDecimalOptions;
+import market.guess.service.helpers.BigDecimalOptions;
 
 public final class Ledger {
   private final String owner;
@@ -31,5 +31,6 @@ public final class Ledger {
 
   public void record(LedgerEntry entry) {
     entries.add(entry);
+    this.balance = entry.balanceAfter();
   }
 }
diff --git a/service/src/main/java/market/guess/service/ledger/LedgerContext.java b/service/src/main/java/market/guess/service/ledger/LedgerContext.java
index 12ec614..bb1bf97 100644
--- a/service/src/main/java/market/guess/service/ledger/LedgerContext.java
+++ b/service/src/main/java/market/guess/service/ledger/LedgerContext.java
@@ -3,7 +3,7 @@ package market.guess.service.ledger;
 import java.math.BigDecimal;
 import java.time.Clock;
 import market.guess.model.ledger.LedgerType;
-import market.guess.service.infrastructure.repository.UserRepository;
+import market.guess.service.catalog.infrastructure.repository.UserRepository;
 
 public final class LedgerContext {
   private final Clock clock;
@@ -11,10 +11,6 @@ public final class LedgerContext {
 
   private int runningId;
 
-  public LedgerContext(UserRepository users) {
-    this(users, Clock.systemUTC());
-  }
-
   public LedgerContext(UserRepository users, Clock clock) {
     super();
     this.clock = clock;
diff --git a/service/src/main/java/market/guess/service/matching/LocalMatchingEngine.java b/service/src/main/java/market/guess/service/matching/LocalMatchingEngine.java
new file mode 100644
index 0000000..6a815c8
--- /dev/null
+++ b/service/src/main/java/market/guess/service/matching/LocalMatchingEngine.java
@@ -0,0 +1,20 @@
+package market.guess.service.matching;
+
+import java.util.List;
+import market.guess.service.domain.Order;
+import market.guess.service.domain.Trade;
+
+public final class LocalMatchingEngine implements MatchingEngine {
+
+  @Override
+  public List<Trade> match(Order order) {
+    var mechanism = order.event().getMechanism();
+    return mechanism.buy(order.event(), order.market(), order.quantity());
+  }
+
+  @Override
+  public boolean cancelOrder() {
+    // TODO Auto-generated method stub
+    throw new UnsupportedOperationException("Unimplemented method 'cancelOrder'");
+  }
+}
diff --git a/service/src/main/java/market/guess/service/matching/MatchingEngine.java b/service/src/main/java/market/guess/service/matching/MatchingEngine.java
new file mode 100644
index 0000000..a8fc0c4
--- /dev/null
+++ b/service/src/main/java/market/guess/service/matching/MatchingEngine.java
@@ -0,0 +1,11 @@
+package market.guess.service.matching;
+
+import java.util.List;
+import market.guess.service.domain.Order;
+import market.guess.service.domain.Trade;
+
+public interface MatchingEngine {
+  List<Trade> match(Order order);
+
+  boolean cancelOrder();
+}
diff --git a/service/src/main/java/market/guess/service/matching/OrderMatchingContext.java b/service/src/main/java/market/guess/service/matching/OrderMatchingContext.java
deleted file mode 100644
index 8882432..0000000
--- a/service/src/main/java/market/guess/service/matching/OrderMatchingContext.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package market.guess.service.matching;
-
-import java.util.List;
-import market.guess.service.domain.Event;
-import market.guess.service.domain.Market;
-import market.guess.service.domain.Trade;
-import market.guess.service.domain.User;
-
-public interface OrderMatchingContext {
-  List<Trade> submitOrder(User user, Event event, Market market, int quantity);
-
-  boolean cancelOrder();
-}
diff --git a/service/src/main/java/market/guess/service/mechanism/LmsrTradingMechanism.java b/service/src/main/java/market/guess/service/mechanism/LmsrTradingMechanism.java
index cdba3f6..87c5661 100644
--- a/service/src/main/java/market/guess/service/mechanism/LmsrTradingMechanism.java
+++ b/service/src/main/java/market/guess/service/mechanism/LmsrTradingMechanism.java
@@ -1,17 +1,30 @@
 package market.guess.service.mechanism;
 
 import java.math.BigDecimal;
+import java.time.Clock;
 import java.util.Arrays;
+import java.util.List;
 import market.guess.api.MechanismType;
-import market.guess.service.domain.BigDecimalOptions;
+import market.guess.service.domain.Event;
+import market.guess.service.domain.Market;
+import market.guess.service.domain.Trade;
+import market.guess.service.helpers.BigDecimalOptions;
 
 public final class LmsrTradingMechanism implements TradingMechanism {
   private final int liquidity;
   private final int[] q;
 
+  private final Clock clock;
+
   public LmsrTradingMechanism(int liquidity, int optionCount) {
+    this(liquidity, optionCount, Clock.systemUTC());
+  }
+
+  public LmsrTradingMechanism(int liquidity, int optionCount, Clock clock) {
+    super();
     this.liquidity = liquidity;
     this.q = new int[optionCount];
+    this.clock = clock;
   }
 
   @Override
@@ -20,12 +33,8 @@ public final class LmsrTradingMechanism implements TradingMechanism {
   }
 
   @Override
-  public BigDecimal openingCost() {
-    return BigDecimalOptions.toMoney(cost(new int[q.length]));
-  }
-
-  @Override
-  public TradeExecution buy(int optionIndex, int quantity) {
+  public List<Trade> buy(Event event, Market market, long quantity) {
+    var optionIndex = event.getMarkets().indexOf(market);
     var before = cost(q);
 
     var after = q.clone();
@@ -34,7 +43,16 @@ public final class LmsrTradingMechanism implements TradingMechanism {
 
     q[optionIndex] += quantity;
 
-    return new TradeExecution(quantity, BigDecimalOptions.toMoney(delta));
+    return List.of(
+        new Trade(
+            0,
+            clock.instant(),
+            null,
+            market.getKey(),
+            market.getName(),
+            quantity,
+            BigDecimalOptions.toMoney(delta),
+            null));
   }
 
   @Override
diff --git a/service/src/main/java/market/guess/service/mechanism/OrderBookTradingMechanism.java b/service/src/main/java/market/guess/service/mechanism/OrderBookTradingMechanism.java
index 43f4843..4e0dd0a 100644
--- a/service/src/main/java/market/guess/service/mechanism/OrderBookTradingMechanism.java
+++ b/service/src/main/java/market/guess/service/mechanism/OrderBookTradingMechanism.java
@@ -5,8 +5,10 @@ import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import market.guess.api.MechanismType;
-import market.guess.service.domain.BigDecimalOptions;
+import market.guess.service.domain.Event;
+import market.guess.service.domain.Market;
 import market.guess.service.domain.Trade;
+import market.guess.service.helpers.BigDecimalOptions;
 
 public final class OrderBookTradingMechanism implements TradingMechanism {
   public enum Side {
@@ -54,13 +56,9 @@ public final class OrderBookTradingMechanism implements TradingMechanism {
   }
 
   @Override
-  public BigDecimal openingCost() {
-    return BigDecimalOptions.toMoney(initial);
-  }
-
-  @Override
-  public Trade buy(int optionIndex, int quantity) {
-    return match(optionIndex, Side.BUY, quantity, null, false);
+  public List<Trade> buy(Event event, Market market, long quantity) {
+    var optionIndex = event.getMarkets().indexOf(market);
+    return List.of(match(optionIndex, Side.BUY, (int) quantity, null, false));
   }
 
   /** Priced limit order — not on the shared interface, no engine call site yet. */
diff --git a/service/src/main/java/market/guess/service/mechanism/TradingMechanism.java b/service/src/main/java/market/guess/service/mechanism/TradingMechanism.java
index 204a170..16a5c6f 100644
--- a/service/src/main/java/market/guess/service/mechanism/TradingMechanism.java
+++ b/service/src/main/java/market/guess/service/mechanism/TradingMechanism.java
@@ -1,16 +1,17 @@
 package market.guess.service.mechanism;
 
 import java.math.BigDecimal;
+import java.util.List;
 import market.guess.api.MechanismType;
+import market.guess.service.domain.Event;
+import market.guess.service.domain.Market;
 import market.guess.service.domain.Trade;
 
 public sealed interface TradingMechanism permits LmsrTradingMechanism, OrderBookTradingMechanism {
 
   MechanismType getType();
 
-  BigDecimal openingCost();
-
-  Trade buy(int optionIndex, int quantity);
+  List<Trade> buy(Event event, Market market, long quantity);
 
   BigDecimal[] prices();
 }
diff --git a/service/src/main/java/market/guess/service/model/v1/GMEvent.java b/service/src/main/java/market/guess/service/model/v1/GMEvent.java
deleted file mode 100644
index efe5d30..0000000
--- a/service/src/main/java/market/guess/service/model/v1/GMEvent.java
+++ /dev/null
@@ -1,215 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v1;
-
-import java.util.ArrayList;
-import java.util.List;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}id"/>
- *         <element ref="{}description"/>
- *         <element ref="{}comision"/>
- *         <element ref="{}GM-options"/>
- *         <element ref="{}GM-method"/>
- *       </sequence>
- *       <attribute name="name" use="required">
- *         <simpleType>
- *           <list itemType="{http://www.w3.org/2001/XMLSchema}string" />
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "id",
-    "description",
-    "comision",
-    "gmOptions",
-    "gmMethod"
-})
-@XmlRootElement(name = "GM-event")
-public class GMEvent {
-
-    protected int id;
-    @XmlElement(required = true)
-    protected String description;
-    @XmlElement(required = true)
-    protected Comision comision;
-    @XmlElement(name = "GM-options", required = true)
-    protected GMOptions gmOptions;
-    @XmlElement(name = "GM-method", required = true)
-    protected GMMethod gmMethod;
-    @XmlAttribute(name = "name", required = true)
-    protected List<String> name;
-
-    /**
-     * Gets the value of the id property.
-     * 
-     */
-    public int getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     */
-    public void setId(int value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the comision property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Comision }
-     *     
-     */
-    public Comision getComision() {
-        return comision;
-    }
-
-    /**
-     * Sets the value of the comision property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Comision }
-     *     
-     */
-    public void setComision(Comision value) {
-        this.comision = value;
-    }
-
-    /**
-     * Gets the value of the gmOptions property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMOptions }
-     *     
-     */
-    public GMOptions getGMOptions() {
-        return gmOptions;
-    }
-
-    /**
-     * Sets the value of the gmOptions property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMOptions }
-     *     
-     */
-    public void setGMOptions(GMOptions value) {
-        this.gmOptions = value;
-    }
-
-    /**
-     * Gets the value of the gmMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMMethod }
-     *     
-     */
-    public GMMethod getGMMethod() {
-        return gmMethod;
-    }
-
-    /**
-     * Sets the value of the gmMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMMethod }
-     *     
-     */
-    public void setGMMethod(GMMethod value) {
-        this.gmMethod = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * <p>This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the name property.</p>
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getName().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * </p>
-     * 
-     * 
-     * @return
-     *     The value of the name property.
-     */
-    public List<String> getName() {
-        if (name == null) {
-            name = new ArrayList<>();
-        }
-        return this.name;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v1/GMEvents.java b/service/src/main/java/market/guess/service/model/v1/GMEvents.java
deleted file mode 100644
index ca4efea..0000000
--- a/service/src/main/java/market/guess/service/model/v1/GMEvents.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v1;
-
-import java.util.ArrayList;
-import java.util.List;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}GM-event" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "gmEvent"
-})
-@XmlRootElement(name = "GM-events")
-public class GMEvents {
-
-    @XmlElement(name = "GM-event", required = true)
-    protected List<GMEvent> gmEvent;
-
-    /**
-     * Gets the value of the gmEvent property.
-     * 
-     * <p>This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the gmEvent property.</p>
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getGMEvent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link GMEvent }
-     * </p>
-     * 
-     * 
-     * @return
-     *     The value of the gmEvent property.
-     */
-    public List<GMEvent> getGMEvent() {
-        if (gmEvent == null) {
-            gmEvent = new ArrayList<>();
-        }
-        return this.gmEvent;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v1/GMOptions.java b/service/src/main/java/market/guess/service/model/v1/GMOptions.java
deleted file mode 100644
index d344f74..0000000
--- a/service/src/main/java/market/guess/service/model/v1/GMOptions.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v1;
-
-import java.util.ArrayList;
-import java.util.List;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}GM-option" maxOccurs="2"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "gmOption"
-})
-@XmlRootElement(name = "GM-options")
-public class GMOptions {
-
-    @XmlElement(name = "GM-option", required = true)
-    protected List<String> gmOption;
-
-    /**
-     * Gets the value of the gmOption property.
-     * 
-     * <p>This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the gmOption property.</p>
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getGMOption().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * </p>
-     * 
-     * 
-     * @return
-     *     The value of the gmOption property.
-     */
-    public List<String> getGMOption() {
-        if (gmOption == null) {
-            gmOption = new ArrayList<>();
-        }
-        return this.gmOption;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v1/ObjectFactory.java b/service/src/main/java/market/guess/service/model/v1/ObjectFactory.java
deleted file mode 100644
index cd43428..0000000
--- a/service/src/main/java/market/guess/service/model/v1/ObjectFactory.java
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v1;
-
-import javax.xml.namespace.QName;
-import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.annotation.XmlElementDecl;
-import jakarta.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the market.guess.service.model.v1 package. 
- * <p>An ObjectFactory allows you to programmatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private static final QName _Id_QNAME = new QName("", "id");
-    private static final QName _Description_QNAME = new QName("", "description");
-    private static final QName _B_QNAME = new QName("", "b");
-    private static final QName _GMOption_QNAME = new QName("", "GM-option");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: market.guess.service.model.v1
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link Comision }
-     * 
-     * @return
-     *     the new instance of {@link Comision }
-     */
-    public Comision createComision() {
-        return new Comision();
-    }
-
-    /**
-     * Create an instance of {@link GuessMarket }
-     * 
-     * @return
-     *     the new instance of {@link GuessMarket }
-     */
-    public GuessMarket createGuessMarket() {
-        return new GuessMarket();
-    }
-
-    /**
-     * Create an instance of {@link GMEvents }
-     * 
-     * @return
-     *     the new instance of {@link GMEvents }
-     */
-    public GMEvents createGMEvents() {
-        return new GMEvents();
-    }
-
-    /**
-     * Create an instance of {@link GMEvent }
-     * 
-     * @return
-     *     the new instance of {@link GMEvent }
-     */
-    public GMEvent createGMEvent() {
-        return new GMEvent();
-    }
-
-    /**
-     * Create an instance of {@link GMOptions }
-     * 
-     * @return
-     *     the new instance of {@link GMOptions }
-     */
-    public GMOptions createGMOptions() {
-        return new GMOptions();
-    }
-
-    /**
-     * Create an instance of {@link GMMethod }
-     * 
-     * @return
-     *     the new instance of {@link GMMethod }
-     */
-    public GMMethod createGMMethod() {
-        return new GMMethod();
-    }
-
-    /**
-     * Create an instance of {@link GMLMSR }
-     * 
-     * @return
-     *     the new instance of {@link GMLMSR }
-     */
-    public GMLMSR createGMLMSR() {
-        return new GMLMSR();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
-     */
-    @XmlElementDecl(namespace = "", name = "id")
-    public JAXBElement<Integer> createId(Integer value) {
-        return new JAXBElement<>(_Id_QNAME, Integer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-     */
-    @XmlElementDecl(namespace = "", name = "description")
-    public JAXBElement<String> createDescription(String value) {
-        return new JAXBElement<>(_Description_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
-     */
-    @XmlElementDecl(namespace = "", name = "b")
-    public JAXBElement<Integer> createB(Integer value) {
-        return new JAXBElement<>(_B_QNAME, Integer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-     */
-    @XmlElementDecl(namespace = "", name = "GM-option")
-    public JAXBElement<String> createGMOption(String value) {
-        return new JAXBElement<>(_GMOption_QNAME, String.class, null, value);
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v2/GMEvent.java b/service/src/main/java/market/guess/service/model/v2/GMEvent.java
deleted file mode 100644
index c011c32..0000000
--- a/service/src/main/java/market/guess/service/model/v2/GMEvent.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v2;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}id"/>
- *         <element ref="{}description"/>
- *         <element ref="{}commission"/>
- *         <element ref="{}GM-options"/>
- *         <element ref="{}GM-method"/>
- *       </sequence>
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "id",
-    "description",
-    "commission",
-    "gmOptions",
-    "gmMethod"
-})
-@XmlRootElement(name = "GM-event")
-public class GMEvent {
-
-    protected int id;
-    @XmlElement(required = true)
-    protected String description;
-    @XmlElement(required = true)
-    protected Commission commission;
-    @XmlElement(name = "GM-options", required = true)
-    protected GMOptions gmOptions;
-    @XmlElement(name = "GM-method", required = true)
-    protected GMMethod gmMethod;
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-
-    /**
-     * Gets the value of the id property.
-     * 
-     */
-    public int getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     */
-    public void setId(int value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the commission property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Commission }
-     *     
-     */
-    public Commission getCommission() {
-        return commission;
-    }
-
-    /**
-     * Sets the value of the commission property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Commission }
-     *     
-     */
-    public void setCommission(Commission value) {
-        this.commission = value;
-    }
-
-    /**
-     * Gets the value of the gmOptions property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMOptions }
-     *     
-     */
-    public GMOptions getGMOptions() {
-        return gmOptions;
-    }
-
-    /**
-     * Sets the value of the gmOptions property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMOptions }
-     *     
-     */
-    public void setGMOptions(GMOptions value) {
-        this.gmOptions = value;
-    }
-
-    /**
-     * Gets the value of the gmMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMMethod }
-     *     
-     */
-    public GMMethod getGMMethod() {
-        return gmMethod;
-    }
-
-    /**
-     * Sets the value of the gmMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMMethod }
-     *     
-     */
-    public void setGMMethod(GMMethod value) {
-        this.gmMethod = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v2/GMEvents.java b/service/src/main/java/market/guess/service/model/v2/GMEvents.java
deleted file mode 100644
index 61a5473..0000000
--- a/service/src/main/java/market/guess/service/model/v2/GMEvents.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v2;
-
-import java.util.ArrayList;
-import java.util.List;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}GM-event" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "gmEvent"
-})
-@XmlRootElement(name = "GM-events")
-public class GMEvents {
-
-    @XmlElement(name = "GM-event", required = true)
-    protected List<GMEvent> gmEvent;
-
-    /**
-     * Gets the value of the gmEvent property.
-     * 
-     * <p>This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the gmEvent property.</p>
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getGMEvent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link GMEvent }
-     * </p>
-     * 
-     * 
-     * @return
-     *     The value of the gmEvent property.
-     */
-    public List<GMEvent> getGMEvent() {
-        if (gmEvent == null) {
-            gmEvent = new ArrayList<>();
-        }
-        return this.gmEvent;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v2/GMMarketMaker.java b/service/src/main/java/market/guess/service/model/v2/GMMarketMaker.java
deleted file mode 100644
index 2eb0e6e..0000000
--- a/service/src/main/java/market/guess/service/model/v2/GMMarketMaker.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v2;
-
-import java.util.ArrayList;
-import java.util.List;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}event" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "event"
-})
-@XmlRootElement(name = "GM-market-maker")
-public class GMMarketMaker {
-
-    @XmlElement(required = true)
-    protected List<Event> event;
-
-    /**
-     * Gets the value of the event property.
-     * 
-     * <p>This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the event property.</p>
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getEvent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Event }
-     * </p>
-     * 
-     * 
-     * @return
-     *     The value of the event property.
-     */
-    public List<Event> getEvent() {
-        if (event == null) {
-            event = new ArrayList<>();
-        }
-        return this.event;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v2/GMMethod.java b/service/src/main/java/market/guess/service/model/v2/GMMethod.java
deleted file mode 100644
index 06338c0..0000000
--- a/service/src/main/java/market/guess/service/model/v2/GMMethod.java
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v2;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{}GM-LMSR"/>
- *         <element ref="{}GM-order-book"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "gmlmsr",
-    "gmOrderBook"
-})
-@XmlRootElement(name = "GM-method")
-public class GMMethod {
-
-    @XmlElement(name = "GM-LMSR")
-    protected GMLMSR gmlmsr;
-    @XmlElement(name = "GM-order-book")
-    protected GMOrderBook gmOrderBook;
-
-    /**
-     * Gets the value of the gmlmsr property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMLMSR }
-     *     
-     */
-    public GMLMSR getGMLMSR() {
-        return gmlmsr;
-    }
-
-    /**
-     * Sets the value of the gmlmsr property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMLMSR }
-     *     
-     */
-    public void setGMLMSR(GMLMSR value) {
-        this.gmlmsr = value;
-    }
-
-    /**
-     * Gets the value of the gmOrderBook property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMOrderBook }
-     *     
-     */
-    public GMOrderBook getGMOrderBook() {
-        return gmOrderBook;
-    }
-
-    /**
-     * Sets the value of the gmOrderBook property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMOrderBook }
-     *     
-     */
-    public void setGMOrderBook(GMOrderBook value) {
-        this.gmOrderBook = value;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v2/GMOptions.java b/service/src/main/java/market/guess/service/model/v2/GMOptions.java
deleted file mode 100644
index a819656..0000000
--- a/service/src/main/java/market/guess/service/model/v2/GMOptions.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v2;
-
-import java.util.ArrayList;
-import java.util.List;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}GM-option" maxOccurs="2"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "gmOption"
-})
-@XmlRootElement(name = "GM-options")
-public class GMOptions {
-
-    @XmlElement(name = "GM-option", required = true)
-    protected List<String> gmOption;
-
-    /**
-     * Gets the value of the gmOption property.
-     * 
-     * <p>This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the gmOption property.</p>
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getGMOption().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * </p>
-     * 
-     * 
-     * @return
-     *     The value of the gmOption property.
-     */
-    public List<String> getGMOption() {
-        if (gmOption == null) {
-            gmOption = new ArrayList<>();
-        }
-        return this.gmOption;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v2/GMOrderBook.java b/service/src/main/java/market/guess/service/model/v2/GMOrderBook.java
deleted file mode 100644
index f38c707..0000000
--- a/service/src/main/java/market/guess/service/model/v2/GMOrderBook.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v2;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="initial" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *       <attribute name="d" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- *       <attribute name="allow-mint" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <enumeration value="false"/>
- *             <enumeration value="true"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-@XmlRootElement(name = "GM-order-book")
-public class GMOrderBook {
-
-    @XmlAttribute(name = "initial", required = true)
-    protected int initial;
-    @XmlAttribute(name = "d", required = true)
-    protected int d;
-    @XmlAttribute(name = "allow-mint", required = true)
-    protected String allowMint;
-
-    /**
-     * Gets the value of the initial property.
-     * 
-     */
-    public int getInitial() {
-        return initial;
-    }
-
-    /**
-     * Sets the value of the initial property.
-     * 
-     */
-    public void setInitial(int value) {
-        this.initial = value;
-    }
-
-    /**
-     * Gets the value of the d property.
-     * 
-     */
-    public int getD() {
-        return d;
-    }
-
-    /**
-     * Sets the value of the d property.
-     * 
-     */
-    public void setD(int value) {
-        this.d = value;
-    }
-
-    /**
-     * Gets the value of the allowMint property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAllowMint() {
-        return allowMint;
-    }
-
-    /**
-     * Sets the value of the allowMint property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAllowMint(String value) {
-        this.allowMint = value;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v2/GMUser.java b/service/src/main/java/market/guess/service/model/v2/GMUser.java
deleted file mode 100644
index 85b41f4..0000000
--- a/service/src/main/java/market/guess/service/model/v2/GMUser.java
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v2;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}initial-cash"/>
- *         <element ref="{}GM-market-maker" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "initialCash",
-    "gmMarketMaker"
-})
-@XmlRootElement(name = "GM-user")
-public class GMUser {
-
-    @XmlElement(name = "initial-cash")
-    protected int initialCash;
-    @XmlElement(name = "GM-market-maker")
-    protected GMMarketMaker gmMarketMaker;
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-
-    /**
-     * Gets the value of the initialCash property.
-     * 
-     */
-    public int getInitialCash() {
-        return initialCash;
-    }
-
-    /**
-     * Sets the value of the initialCash property.
-     * 
-     */
-    public void setInitialCash(int value) {
-        this.initialCash = value;
-    }
-
-    /**
-     * Gets the value of the gmMarketMaker property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMMarketMaker }
-     *     
-     */
-    public GMMarketMaker getGMMarketMaker() {
-        return gmMarketMaker;
-    }
-
-    /**
-     * Sets the value of the gmMarketMaker property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMMarketMaker }
-     *     
-     */
-    public void setGMMarketMaker(GMMarketMaker value) {
-        this.gmMarketMaker = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v2/GMUsers.java b/service/src/main/java/market/guess/service/model/v2/GMUsers.java
deleted file mode 100644
index cfebbc4..0000000
--- a/service/src/main/java/market/guess/service/model/v2/GMUsers.java
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v2;
-
-import java.util.ArrayList;
-import java.util.List;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}GM-user" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "gmUser"
-})
-@XmlRootElement(name = "GM-users")
-public class GMUsers {
-
-    @XmlElement(name = "GM-user", required = true)
-    protected List<GMUser> gmUser;
-
-    /**
-     * Gets the value of the gmUser property.
-     * 
-     * <p>This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the gmUser property.</p>
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getGMUser().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link GMUser }
-     * </p>
-     * 
-     * 
-     * @return
-     *     The value of the gmUser property.
-     */
-    public List<GMUser> getGMUser() {
-        if (gmUser == null) {
-            gmUser = new ArrayList<>();
-        }
-        return this.gmUser;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v2/GuessMarket.java b/service/src/main/java/market/guess/service/model/v2/GuessMarket.java
deleted file mode 100644
index 1ce28c8..0000000
--- a/service/src/main/java/market/guess/service/model/v2/GuessMarket.java
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v2;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type</p>.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * 
- * <pre>{@code
- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <all>
- *         <element ref="{}GM-events"/>
- *         <element ref="{}GM-users"/>
- *       </all>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * }</pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-
-})
-@XmlRootElement(name = "Guess-Market")
-public class GuessMarket {
-
-    @XmlElement(name = "GM-events", required = true)
-    protected GMEvents gmEvents;
-    @XmlElement(name = "GM-users", required = true)
-    protected GMUsers gmUsers;
-
-    /**
-     * Gets the value of the gmEvents property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMEvents }
-     *     
-     */
-    public GMEvents getGMEvents() {
-        return gmEvents;
-    }
-
-    /**
-     * Sets the value of the gmEvents property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMEvents }
-     *     
-     */
-    public void setGMEvents(GMEvents value) {
-        this.gmEvents = value;
-    }
-
-    /**
-     * Gets the value of the gmUsers property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GMUsers }
-     *     
-     */
-    public GMUsers getGMUsers() {
-        return gmUsers;
-    }
-
-    /**
-     * Sets the value of the gmUsers property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GMUsers }
-     *     
-     */
-    public void setGMUsers(GMUsers value) {
-        this.gmUsers = value;
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/model/v2/ObjectFactory.java b/service/src/main/java/market/guess/service/model/v2/ObjectFactory.java
deleted file mode 100644
index 7f0fff9..0000000
--- a/service/src/main/java/market/guess/service/model/v2/ObjectFactory.java
+++ /dev/null
@@ -1,231 +0,0 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v4.0.5 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-//
-
-
-package market.guess.service.model.v2;
-
-import javax.xml.namespace.QName;
-import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.annotation.XmlElementDecl;
-import jakarta.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the market.guess.service.model.v2 package. 
- * <p>An ObjectFactory allows you to programmatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private static final QName _InitialCash_QNAME = new QName("", "initial-cash");
-    private static final QName _Id_QNAME = new QName("", "id");
-    private static final QName _Description_QNAME = new QName("", "description");
-    private static final QName _B_QNAME = new QName("", "b");
-    private static final QName _GMOption_QNAME = new QName("", "GM-option");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: market.guess.service.model.v2
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link Event }
-     * 
-     * @return
-     *     the new instance of {@link Event }
-     */
-    public Event createEvent() {
-        return new Event();
-    }
-
-    /**
-     * Create an instance of {@link Commission }
-     * 
-     * @return
-     *     the new instance of {@link Commission }
-     */
-    public Commission createCommission() {
-        return new Commission();
-    }
-
-    /**
-     * Create an instance of {@link GuessMarket }
-     * 
-     * @return
-     *     the new instance of {@link GuessMarket }
-     */
-    public GuessMarket createGuessMarket() {
-        return new GuessMarket();
-    }
-
-    /**
-     * Create an instance of {@link GMEvents }
-     * 
-     * @return
-     *     the new instance of {@link GMEvents }
-     */
-    public GMEvents createGMEvents() {
-        return new GMEvents();
-    }
-
-    /**
-     * Create an instance of {@link GMEvent }
-     * 
-     * @return
-     *     the new instance of {@link GMEvent }
-     */
-    public GMEvent createGMEvent() {
-        return new GMEvent();
-    }
-
-    /**
-     * Create an instance of {@link GMOptions }
-     * 
-     * @return
-     *     the new instance of {@link GMOptions }
-     */
-    public GMOptions createGMOptions() {
-        return new GMOptions();
-    }
-
-    /**
-     * Create an instance of {@link GMMethod }
-     * 
-     * @return
-     *     the new instance of {@link GMMethod }
-     */
-    public GMMethod createGMMethod() {
-        return new GMMethod();
-    }
-
-    /**
-     * Create an instance of {@link GMLMSR }
-     * 
-     * @return
-     *     the new instance of {@link GMLMSR }
-     */
-    public GMLMSR createGMLMSR() {
-        return new GMLMSR();
-    }
-
-    /**
-     * Create an instance of {@link GMOrderBook }
-     * 
-     * @return
-     *     the new instance of {@link GMOrderBook }
-     */
-    public GMOrderBook createGMOrderBook() {
-        return new GMOrderBook();
-    }
-
-    /**
-     * Create an instance of {@link GMUsers }
-     * 
-     * @return
-     *     the new instance of {@link GMUsers }
-     */
-    public GMUsers createGMUsers() {
-        return new GMUsers();
-    }
-
-    /**
-     * Create an instance of {@link GMUser }
-     * 
-     * @return
-     *     the new instance of {@link GMUser }
-     */
-    public GMUser createGMUser() {
-        return new GMUser();
-    }
-
-    /**
-     * Create an instance of {@link GMMarketMaker }
-     * 
-     * @return
-     *     the new instance of {@link GMMarketMaker }
-     */
-    public GMMarketMaker createGMMarketMaker() {
-        return new GMMarketMaker();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
-     */
-    @XmlElementDecl(namespace = "", name = "initial-cash")
-    public JAXBElement<Integer> createInitialCash(Integer value) {
-        return new JAXBElement<>(_InitialCash_QNAME, Integer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
-     */
-    @XmlElementDecl(namespace = "", name = "id")
-    public JAXBElement<Integer> createId(Integer value) {
-        return new JAXBElement<>(_Id_QNAME, Integer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-     */
-    @XmlElementDecl(namespace = "", name = "description")
-    public JAXBElement<String> createDescription(String value) {
-        return new JAXBElement<>(_Description_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
-     */
-    @XmlElementDecl(namespace = "", name = "b")
-    public JAXBElement<Integer> createB(Integer value) {
-        return new JAXBElement<>(_B_QNAME, Integer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
-     */
-    @XmlElementDecl(namespace = "", name = "GM-option")
-    public JAXBElement<String> createGMOption(String value) {
-        return new JAXBElement<>(_GMOption_QNAME, String.class, null, value);
-    }
-
-}
diff --git a/service/src/main/java/market/guess/service/risk/LocalRiskEngine.java b/service/src/main/java/market/guess/service/risk/LocalRiskEngine.java
new file mode 100644
index 0000000..d3e46e2
--- /dev/null
+++ b/service/src/main/java/market/guess/service/risk/LocalRiskEngine.java
@@ -0,0 +1,18 @@
+package market.guess.service.risk;
+
+import java.math.BigDecimal;
+import market.guess.api.Result;
+import market.guess.service.domain.Order;
+import market.guess.service.domain.User;
+
+public final class LocalRiskEngine implements RiskEngine {
+
+  @Override
+  public Result<Void> check(User user, Order order) {
+    var cost = order.price().multiply(BigDecimal.valueOf(order.quantity()));
+    if (user.getLedger().getBalance().compareTo(cost) < 0) {
+      return Result.error("Insufficient balance.");
+    }
+    return Result.ok();
+  }
+}
diff --git a/service/src/main/java/market/guess/service/risk/RiskEngine.java b/service/src/main/java/market/guess/service/risk/RiskEngine.java
new file mode 100644
index 0000000..3b71650
--- /dev/null
+++ b/service/src/main/java/market/guess/service/risk/RiskEngine.java
@@ -0,0 +1,9 @@
+package market.guess.service.risk;
+
+import market.guess.api.Result;
+import market.guess.service.domain.Order;
+import market.guess.service.domain.User;
+
+public interface RiskEngine {
+  Result<Void> check(User user, Order order);
+}
diff --git a/service/src/main/java/market/guess/service/settlement/LocalSettlementContext.java b/service/src/main/java/market/guess/service/settlement/LocalSettlementContext.java
new file mode 100644
index 0000000..118e349
--- /dev/null
+++ b/service/src/main/java/market/guess/service/settlement/LocalSettlementContext.java
@@ -0,0 +1,50 @@
+package market.guess.service.settlement;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import market.guess.api.CommissionTiming;
+import market.guess.model.event.EventStatus;
+import market.guess.model.ledger.LedgerType;
+import market.guess.service.domain.Event;
+import market.guess.service.helpers.BigDecimalOptions;
+import market.guess.service.ledger.LedgerContext;
+
+public final class LocalSettlementContext implements SettlementContext {
+  private final LedgerContext ledger;
+
+  public LocalSettlementContext(LedgerContext ledger) {
+    this.ledger = ledger;
+  }
+
+  @Override
+  public BigDecimal settle(Event event, String winningOptionKey) {
+    event.setWinningOptionKey(winningOptionKey);
+
+    var chargeCommission = event.getCommissionTiming() == CommissionTiming.ON_CLOSE;
+    var rate = BigDecimal.valueOf(event.getCommissionPercent()).divide(BigDecimal.valueOf(100));
+    var winningOption = event.getOption(winningOptionKey);
+
+    var sharesByUser = new HashMap<String, Long>();
+    for (var trade : event.getTrades()) {
+      if (!trade.marketKey().equalsIgnoreCase(winningOptionKey)) continue;
+      sharesByUser.merge(trade.buyerUserName(), trade.quantity(), Long::sum);
+    }
+
+    var totalPayout = BigDecimalOptions.ZERO_MONEY;
+    for (var entry : sharesByUser.entrySet()) {
+      var gross = BigDecimalOptions.toMoney(BigDecimal.valueOf(entry.getValue()));
+      var commission =
+          chargeCommission
+              ? BigDecimalOptions.toMoney(gross.multiply(rate))
+              : BigDecimalOptions.ZERO_MONEY;
+      var net = gross.subtract(commission);
+
+      ledger.credit(entry.getKey(), LedgerType.PAYOUT, net, "Payout: " + winningOption.getName());
+      event.addSettlementCommission(commission);
+      totalPayout = totalPayout.add(net);
+    }
+
+    event.setState(EventStatus.SETTLED);
+    return totalPayout;
+  }
+}
diff --git a/service/src/main/java/market/guess/service/settlement/SettlementContext.java b/service/src/main/java/market/guess/service/settlement/SettlementContext.java
new file mode 100644
index 0000000..07b9cd0
--- /dev/null
+++ b/service/src/main/java/market/guess/service/settlement/SettlementContext.java
@@ -0,0 +1,8 @@
+package market.guess.service.settlement;
+
+import java.math.BigDecimal;
+import market.guess.service.domain.Event;
+
+public interface SettlementContext {
+  BigDecimal settle(Event event, String winningOptionKey);
+}
diff --git a/ui-console/src/main/java/market/guess/ui/console/App.java b/ui-console/src/main/java/market/guess/ui/console/App.java
index a628a36..5ee5aaf 100644
--- a/ui-console/src/main/java/market/guess/ui/console/App.java
+++ b/ui-console/src/main/java/market/guess/ui/console/App.java
@@ -1,17 +1,27 @@
 package market.guess.ui.console;
 
+import java.time.Clock;
 import market.guess.api.CatalogContext;
 import market.guess.api.GuessMarketContext;
 import market.guess.service.LocalGuessMarketContext;
 import market.guess.service.catalog.LocalCatalogContext;
-import market.guess.service.infrastructure.MarketContext;
-import market.guess.service.infrastructure.mapper.v1.EventMapperV1;
-import market.guess.service.infrastructure.provider.Loader;
-import market.guess.service.infrastructure.provider.v1.XMLLoaderV1;
-import market.guess.service.infrastructure.repository.EventRepository;
-import market.guess.service.infrastructure.repository.InMemoryEventRepository;
-import market.guess.service.infrastructure.repository.InMemoryUserRepository;
-import market.guess.service.infrastructure.repository.UserRepository;
+import market.guess.service.catalog.infrastructure.MarketContext;
+import market.guess.service.catalog.infrastructure.mapper.v1.EventMapperV1;
+import market.guess.service.catalog.infrastructure.provider.Loader;
+import market.guess.service.catalog.infrastructure.provider.v1.XMLLoaderV1;
+import market.guess.service.catalog.infrastructure.repository.EventRepository;
+import market.guess.service.catalog.infrastructure.repository.InMemoryEventRepository;
+import market.guess.service.catalog.infrastructure.repository.InMemoryUserRepository;
+import market.guess.service.catalog.infrastructure.repository.UserRepository;
+import market.guess.service.fulfillment.FulfillmentContext;
+import market.guess.service.fulfillment.LocalFulfillmentContext;
+import market.guess.service.ledger.LedgerContext;
+import market.guess.service.matching.LocalMatchingEngine;
+import market.guess.service.matching.MatchingEngine;
+import market.guess.service.risk.LocalRiskEngine;
+import market.guess.service.risk.RiskEngine;
+import market.guess.service.settlement.LocalSettlementContext;
+import market.guess.service.settlement.SettlementContext;
 import market.guess.ui.console.command.BuyMenuCommand;
 import market.guess.ui.console.command.EventDetailsMenuCommand;
 import market.guess.ui.console.command.ExitMenuCommand;
@@ -35,6 +45,13 @@ public class App {
     pico.addComponent(Loader.class, XMLLoaderV1.class);
     pico.addComponent(GuessMarketContext.class, LocalGuessMarketContext.class);
     pico.addComponent(CatalogContext.class, LocalCatalogContext.class);
+    pico.addComponent(LedgerContext.class);
+    pico.addComponent(RiskEngine.class, LocalRiskEngine.class);
+    pico.addComponent(MatchingEngine.class, LocalMatchingEngine.class);
+    pico.addComponent(FulfillmentContext.class, LocalFulfillmentContext.class);
+    pico.addComponent(SettlementContext.class, LocalSettlementContext.class);
+
+    pico.addComponent(Clock.class, Clock.systemUTC());
 
     pico.addComponent(LoadFileMenuCommand.class);
     pico.addComponent(ListEventsMenuCommand.class);
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 87da340..bee2351 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,5 +1,6 @@
 package market.guess.ui.console.command;
 
+import java.math.BigDecimal;
 import market.guess.api.CatalogContext;
 import market.guess.api.GuessMarketContext;
 import market.guess.model.event.EventStatus;
@@ -63,7 +64,9 @@ public final class BuyMenuCommand implements MenuCommand {
 
     var amount = io.readInt("How many shares? ", 1, Integer.MAX_VALUE);
 
-    var buyResult = context.buyShares("Tester", event.summary().key(), market.key(), amount);
+    var buyResult =
+        context.placeOrder(
+            "Tester", event.summary().key(), market.key(), new BigDecimal(market.price()), amount);
     if (buyResult.isSuccess()) {
       io.printReceipt(buyResult.getData());
       return;
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 881acfa..c9e7585 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
@@ -51,5 +51,6 @@ public final class EventDetailsMenuCommand implements MenuCommand {
     }
 
     io.printState(event.state());
+    io.printHistory(event.history());
   }
 }
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 46312e4..024f1f7 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
@@ -25,11 +25,8 @@ public final class LoadFileMenuCommand implements MenuCommand {
 
   @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));
-    var result =
-        catalog.loadEvents(
-            Path.of("/home/hex-dev/projects/guess-market/test-data/ex-1/multiple.xml"));
+    var path = io.readPath("Pleae enter the full file path to the XML file: ");
+    var result = catalog.loadEvents(Path.of(path));
 
     if (result.isSuccess()) {
       io.println(
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 b7344e3..8cc7b02 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
@@ -1,14 +1,19 @@
 package market.guess.ui.console.command;
 
+import market.guess.api.CatalogContext;
 import market.guess.api.GuessMarketContext;
+import market.guess.model.event.EventStatus;
 import market.guess.ui.console.io.InputProcessor;
 
 public final class SettleEventMenuCommand implements MenuCommand {
   private final GuessMarketContext context;
+  private final CatalogContext catalog;
   private final InputProcessor io;
 
-  public SettleEventMenuCommand(GuessMarketContext context, InputProcessor io) {
+  public SettleEventMenuCommand(
+      GuessMarketContext context, CatalogContext catalog, InputProcessor io) {
     this.context = context;
+    this.catalog = catalog;
     this.io = io;
   }
 
@@ -24,7 +29,42 @@ public final class SettleEventMenuCommand implements MenuCommand {
 
   @Override
   public void execute() {
-    // TODO Auto-generated method stub
-    throw new UnsupportedOperationException("Unimplemented method 'execute'");
+    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 settle.");
+      return;
+    }
+
+    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;
+    }
+
+    io.printState(event.state());
+
+    var winner =
+        io.readSelect("Which option won? ", event.state().markets(), o -> "%s".formatted(o.name()));
+
+    var settleResult = context.settleEvent("Tester", event.summary().key(), winner.key());
+    if (settleResult.isSuccess()) {
+      io.newLine();
+      io.println("Settled. Winning option: %s".formatted(settleResult.getData().winningOption()));
+      return;
+    }
+    io.newLine();
+    io.println("Settlement failed: %s".formatted(settleResult.getMessage()));
   }
 }
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 d644a9b..7587768 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
@@ -5,8 +5,16 @@ import java.util.Scanner;
 import java.util.function.Function;
 import market.guess.api.MarketStateDTO;
 import market.guess.api.PurchaseReceiptDTO;
+import market.guess.api.TradeRowDTO;
 
 public final class InputProcessor {
+  private static final int OPTION_WIDTH = 18;
+  private static final int VALUE_WIDTH = 10;
+  private static final int SHARES_WIDTH = 8;
+  private static final int QTY_WIDTH = 6;
+  private static final int PAID_WIDTH = 8;
+  private static final int AT_WIDTH = 20;
+
   private final Scanner scanner = new Scanner(System.in);
 
   public void print(Object object) {
@@ -28,34 +36,24 @@ public final class InputProcessor {
 
   public void printState(MarketStateDTO state) {
     newLine();
-    println(
-        "%s|%s%s|%s"
-            .formatted(
-                padAround("Option", 18), space(10), padLeft("Value", 8), padRight("Shares", 8)));
-
-    println("-".repeat(46));
+    println(marketRow("Option", "Value", "Shares"));
+    println("-".repeat(OPTION_WIDTH + VALUE_WIDTH + SHARES_WIDTH + 2));
 
     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)));
+      println(marketRow(market.name(), market.price(), market.volume()));
     }
     newLine();
 
-    println("Event ledger balance: ".formatted(state.accountBalance()));
-    println("Commission collected: ".formatted(state.commissionCollected()));
+    println("Event ledger balance: %s".formatted(state.accountBalance()));
+    println("Commission collected: %s".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 marketRow(String option, String value, String shares) {
+    return "%s|%s|%s"
+        .formatted(
+            padRight(option, OPTION_WIDTH),
+            padLeft(value, VALUE_WIDTH),
+            padLeft(shares, SHARES_WIDTH));
   }
 
   private static String padRight(String input, int width) {
@@ -141,6 +139,41 @@ public final class InputProcessor {
   }
 
   public void printReceipt(PurchaseReceiptDTO receipt) {
-    println(receipt);
+    newLine();
+    println("Purchase confirmed:");
+    println(tradeRow("Option", "Qty", "Paid", "At"));
+    println("-".repeat(OPTION_WIDTH + QTY_WIDTH + PAID_WIDTH + AT_WIDTH + 3));
+
+    for (var trade : receipt.trades()) {
+      println(tradeRow(trade.optionName(), trade.quantity(), trade.pricePaid(), trade.at()));
+    }
+
+    printState(receipt.stateAfter());
+  }
+
+  public void printHistory(List<TradeRowDTO> history) {
+    newLine();
+    println("Trade history (newest first):");
+
+    if (history.isEmpty()) {
+      println("No trades yet.");
+      return;
+    }
+
+    println(tradeRow("Option", "Qty", "Paid", "At"));
+    println("-".repeat(OPTION_WIDTH + QTY_WIDTH + PAID_WIDTH + AT_WIDTH + 3));
+
+    for (var trade : history) {
+      println(tradeRow(trade.optionName(), trade.quantity(), trade.pricePaid(), trade.at()));
+    }
+  }
+
+  private static String tradeRow(String option, String qty, String paid, String at) {
+    return "%s|%s|%s|%s"
+        .formatted(
+            padRight(option, OPTION_WIDTH),
+            padLeft(qty, QTY_WIDTH),
+            padLeft(paid, PAID_WIDTH),
+            padRight(at, AT_WIDTH));
   }
 }