diff --git a/client/src/main/java/object/ApiStrategy.java b/client/src/main/java/object/ApiStrategy.java
deleted file mode 100644
index 301c9d33..00000000
--- a/client/src/main/java/object/ApiStrategy.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package object;
-
-/**
- * Wrapper class for an API strategy
- */
-public class ApiStrategy
-{
-	private String name = "";
-	private boolean entropy = false;
-	private boolean vectropy = false;
-	private int portNumber = -1;
-	private String messageType = "";
-	private String error = "";
-	
-	public Object[] getTableModelRow()
-	{
-		boolean enabled = error.isEmpty();
-		Object[] row = {name, Integer.valueOf(portNumber), getGameModeDesc(), messageType, Boolean.valueOf(enabled)};
-		return row;
-	}
-	
-	public boolean isEnabled()
-	{
-		return error.isEmpty();
-	}
-	
-	private String getGameModeDesc()
-	{
-		if (entropy
-		  && vectropy)
-		{
-			return "Both";
-		}
-		else if (entropy)
-		{
-			return "Entropy";
-		}
-		
-		return "Vectropy";
-	}
-	
-	/**
-	 * Gets / sets
-	 */
-	public String getName()
-	{
-		return name;
-	}
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public boolean getEntropy()
-	{
-		return entropy;
-	}
-	public void setEntropy(boolean entropy)
-	{
-		this.entropy = entropy;
-	}
-	public boolean getVectropy()
-	{
-		return vectropy;
-	}
-	public void setVectropy(boolean vectropy)
-	{
-		this.vectropy = vectropy;
-	}
-	public int getPortNumber()
-	{
-		return portNumber;
-	}
-	public void setPortNumber(int portNumber)
-	{
-		this.portNumber = portNumber;
-	}
-	public String getMessageType()
-	{
-		return messageType;
-	}
-	public void setMessageType(String messageType)
-	{
-		this.messageType = messageType;
-	}
-	public String getError()
-	{
-		return error;
-	}
-	public void setError(String error)
-	{
-		this.error = error;
-	}
-}
diff --git a/core/src/main/java/object/Player.java b/client/src/main/java/object/Player.java
similarity index 94%
rename from core/src/main/java/object/Player.java
rename to client/src/main/java/object/Player.java
index 39856b69..773e69de 100644
--- a/core/src/main/java/object/Player.java
+++ b/client/src/main/java/object/Player.java
@@ -1,5 +1,8 @@
 package object;
 
+import strategy.ApiStrategy;
+import strategy.IStrategy;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.prefs.Preferences;
@@ -13,7 +16,7 @@ public class Player
 	private int numberOfCards = -1;
 	private int cardsToSubtract = 0;
 	private boolean enabled = false;
-	private String strategy = null;
+	private IStrategy strategy = null;
 	private List<String> hand = null;
 	private ArrayList<String> revealedCards = new ArrayList<>();
 	
@@ -136,7 +139,7 @@ public void setRevealedCards(ArrayList<String> revealedCards)
 	
 	public boolean isApiStrategy()
 	{
-		return strategy.startsWith("API");
+		return strategy instanceof ApiStrategy;
 	}
 	
 	public String getName()
@@ -171,11 +174,11 @@ public void setEnabled(boolean enabled)
 	{
 		this.enabled = enabled;
 	}
-	public String getStrategy()
+	public IStrategy getStrategy()
 	{
 		return strategy;
 	}
-	public void setStrategy(String strategy)
+	public void setStrategy(IStrategy strategy)
 	{
 		this.strategy = strategy;
 	}
diff --git a/client/src/main/java/screen/ApiAmendDialog.java b/client/src/main/java/screen/ApiAmendDialog.java
deleted file mode 100644
index ffee025f..00000000
--- a/client/src/main/java/screen/ApiAmendDialog.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package screen;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-
-import object.ApiStrategy;
-import util.ApiUtil;
-import util.DialogUtil;
-
-public class ApiAmendDialog extends JDialog
-							implements ActionListener
-{
-	private static final int DEFAULT_PORT_NUMBER = 1153;
-	
-	private ApiStrategy strategy = null;
-	
-	
-	public ApiAmendDialog()
-	{
-		setTitle("API Setup");
-		setSize(350, 300);
-		setLocationRelativeTo(null);
-		setResizable(false);
-		setModal(true);
-		
-		getContentPane().add(okCancelPanel, BorderLayout.SOUTH);
-		okCancelPanel.add(btnOk);
-		okCancelPanel.add(btnCancel);
-		getContentPane().add(panel, BorderLayout.CENTER);
-		panel.setLayout(null);
-		lblName.setBounds(10, 10, 100, 25);
-		panel.add(lblName);
-		lblGameMode.setBounds(10, 45, 100, 25);
-		panel.add(lblGameMode);
-		rdbtnEntropy.setBounds(110, 45, 80, 25);
-		panel.add(rdbtnEntropy);
-		rdbtnVectropy.setBounds(190, 45, 80, 25);
-		panel.add(rdbtnVectropy);
-		rdbtnBoth.setBounds(270, 45, 80, 25);
-		panel.add(rdbtnBoth);
-		btnGroupMode.add(rdbtnEntropy);
-		btnGroupMode.add(rdbtnVectropy);
-		btnGroupMode.add(rdbtnBoth);
-		textFieldName.setBounds(110, 10, 120, 25);
-		panel.add(textFieldName);
-		textFieldName.setColumns(10);
-		lblPort.setBounds(10, 80, 100, 25);
-		panel.add(lblPort);
-		textFieldPort.setBounds(110, 80, 80, 25);
-		panel.add(textFieldPort);
-		textFieldPort.setColumns(10);
-		lblMessageType.setBounds(10, 115, 100, 25);
-		panel.add(lblMessageType);
-		rdbtnXml.setBounds(110, 116, 80, 23);
-		panel.add(rdbtnXml);
-		rdbtnJson.setBounds(190, 116, 109, 23);
-		panel.add(rdbtnJson);
-		btnGroupMessageType.add(rdbtnXml);
-		btnGroupMessageType.add(rdbtnJson);
-		btnTest.setBounds(120, 172, 89, 23);
-		panel.add(btnTest);
-		
-		btnOk.addActionListener(this);
-		btnCancel.addActionListener(this);
-		btnTest.addActionListener(this);
-	}
-	
-	private final JPanel okCancelPanel = new JPanel();
-	private final JButton btnOk = new JButton("Ok");
-	private final JButton btnCancel = new JButton("Cancel");
-	private final JPanel panel = new JPanel();
-	private final JLabel lblName = new JLabel("Name");
-	private final JTextField textFieldName = new JTextField();
-	private final JLabel lblGameMode = new JLabel("Game Mode");
-	private final JRadioButton rdbtnEntropy = new JRadioButton("Entropy");
-	private final JRadioButton rdbtnVectropy = new JRadioButton("Vectropy");
-	private final JRadioButton rdbtnBoth = new JRadioButton("Both");
-	private final ButtonGroup btnGroupMode = new ButtonGroup();
-	private final JLabel lblPort = new JLabel("Port");
-	private final JTextField textFieldPort = new JTextField();
-	private final JLabel lblMessageType = new JLabel("Messaging");
-	private final JRadioButton rdbtnXml = new JRadioButton(ApiUtil.MESSAGE_TYPE_XML);
-	private final JRadioButton rdbtnJson = new JRadioButton(ApiUtil.MESSAGE_TYPE_JSON);
-	private final ButtonGroup btnGroupMessageType = new ButtonGroup();
-	private final JButton btnTest = new JButton("Test");
-	
-	public void init(ApiStrategy strategy)
-	{
-		this.strategy = strategy;
-		
-		if (strategy == null)
-		{
-			//Clear fields
-			textFieldName.setText("");
-			textFieldPort.setText("" + DEFAULT_PORT_NUMBER);
-			rdbtnEntropy.setSelected(true);
-			rdbtnXml.setSelected(true);
-		}
-		else
-		{
-			//Populate fields
-			textFieldName.setText(strategy.getName());
-			textFieldPort.setText("" + strategy.getPortNumber());
-			
-			boolean entropy = strategy.getEntropy();
-			boolean vectropy = strategy.getVectropy();
-			
-			rdbtnEntropy.setSelected(entropy);
-			rdbtnVectropy.setSelected(vectropy);
-			rdbtnBoth.setSelected(entropy && vectropy);
-			
-			String messageType = strategy.getMessageType();
-			rdbtnXml.setSelected(messageType.equals(ApiUtil.MESSAGE_TYPE_XML));
-			rdbtnJson.setSelected(messageType.equals(ApiUtil.MESSAGE_TYPE_JSON));
-		}
-		
-		//rdbtnJson.setEnabled(false);
-	}
-	
-	@Override
-	public void actionPerformed(ActionEvent arg0)
-	{
-		JButton source = (JButton)arg0.getSource();
-		if (source == btnOk)
-		{
-			if (valid())
-			{
-				saveData();
-			}
-		}
-		else if (source == btnCancel)
-		{
-			dispose();
-		}
-		else if (source == btnTest)
-		{
-			sendTestMessage();
-		}
-	}
-	
-	private boolean valid()
-	{
-		String name = textFieldName.getText();
-		if (name.isEmpty())
-		{
-			DialogUtil.showError("You must enter a name for this setup.");
-			return false;
-		}
-		
-		return true;
-	}
-	
-	private void saveData()
-	{
-		if (strategy == null)
-		{
-			strategy = new ApiStrategy();
-		}
-		
-		String name = textFieldName.getText();
-		strategy.setName(name);
-		
-		String portStr = textFieldPort.getText();
-		int port = Integer.parseInt(portStr);
-		strategy.setPortNumber(port);
-		
-		boolean entropy = rdbtnEntropy.isSelected() || rdbtnBoth.isSelected();
-		boolean vectropy = rdbtnVectropy.isSelected() || rdbtnBoth.isSelected();
-		
-		strategy.setEntropy(entropy);
-		strategy.setVectropy(vectropy);
-		
-		if (rdbtnXml.isSelected())
-		{
-			strategy.setMessageType(ApiUtil.MESSAGE_TYPE_XML);
-		}
-		else
-		{
-			strategy.setMessageType(ApiUtil.MESSAGE_TYPE_JSON);
-		}
-		
-		dispose();
-	}
-	
-	private void sendTestMessage()
-	{
-		String infoMsg = "About to send a test message on port " + textFieldPort.getText()
-					   + "\n\nEnsure that the third-party software is running and listening on this port.";
-		
-		DialogUtil.showInfo(infoMsg);
-		
-		String portStr = textFieldPort.getText();
-		int port = Integer.parseInt(portStr);
-		
-		ApiUtil.sendTestMessage(port, rdbtnXml.isSelected());
-	}
-	
-	public ApiStrategy getApiStrategy()
-	{
-		return strategy;
-	}
-	
-	public static ApiStrategy createStrategy()
-	{
-		ApiAmendDialog dialog = new ApiAmendDialog();
-		dialog.init(null);
-		dialog.setVisible(true);
-		
-		return dialog.getApiStrategy();
-	}
-	
-	public static void amendStrategy(ApiStrategy strategy)
-	{
-		ApiAmendDialog dialog = new ApiAmendDialog();
-		dialog.init(strategy);
-		dialog.setVisible(true);
-	}
-}
diff --git a/client/src/main/java/screen/GameScreen.java b/client/src/main/java/screen/GameScreen.java
index a4d724da..b69f5631 100644
--- a/client/src/main/java/screen/GameScreen.java
+++ b/client/src/main/java/screen/GameScreen.java
@@ -5,6 +5,8 @@
 import game.*;
 import object.Player;
 import preference.PreferenceSetting;
+import strategy.InBuiltStrategy;
+import strategy.StrategyParams;
 import util.*;
 
 import javax.swing.*;
@@ -19,8 +21,8 @@
 import static game.RegistryUtilKt.writeActions;
 import static preference.PreferenceSettingKt.getPreference;
 import static screen.ScreenCacheKt.IN_GAME_REPLAY;
+import static strategy.StrategyUtilKt.getStrategy;
 import static util.ClientGlobals.achievementStore;
-import static util.ClientGlobals.preferenceStore;
 import static utils.CoreGlobals.logger;
 
 public abstract class GameScreen<B extends BidAction<B>> extends TransparentPanel
@@ -313,9 +315,9 @@ private void getNewGameVariablesFromRegistry()
 		handicapAmount = getPreference(PreferenceSetting.HandicapAmount);
 		opponentTwo.setEnabled(getPreference(PreferenceSetting.OpponentTwoEnabled));
 		opponentThree.setEnabled(getPreference(PreferenceSetting.OpponentThreeEnabled));
-		opponentOne.setStrategy(getPreference(PreferenceSetting.OpponentOneStrategy));
-		opponentTwo.setStrategy(getPreference(PreferenceSetting.OpponentTwoStrategy));
-		opponentThree.setStrategy(getPreference(PreferenceSetting.OpponentThreeStrategy));
+		opponentOne.setStrategy(getStrategy(PreferenceSetting.OpponentOneStrategy));
+		opponentTwo.setStrategy(getStrategy(PreferenceSetting.OpponentTwoStrategy));
+		opponentThree.setStrategy(getStrategy(PreferenceSetting.OpponentThreeStrategy));
 
 		settings = new GameSettings(
 				getGameMode(),
@@ -459,9 +461,6 @@ protected void roundEnded(int playerLastToAct)
 	protected void saveRoundForReplay()
 	{
 		inGameReplay.putInt(REPLAY_INT_GAME_MODE, ReplayConstantsKt.toReplayConstant(getGameMode()));
-		inGameReplay.put(REPLAY_STRING_OPPONENT_ONE_STRATEGY, opponentOne.getStrategy());
-		inGameReplay.put(REPLAY_STRING_OPPONENT_TWO_STRATEGY, opponentTwo.getStrategy());
-		inGameReplay.put(REPLAY_STRING_OPPONENT_THREE_STRATEGY, opponentThree.getStrategy());		
 		
 		int roundsSoFar = inGameReplay.getInt(REPLAY_INT_ROUNDS_SO_FAR, 0) + 1;
 		inGameReplay.putInt(REPLAY_INT_ROUNDS_SO_FAR, roundsSoFar);
@@ -552,11 +551,6 @@ protected void saveGame()
 		//save the current player
 		savedGame.putInt(SAVED_GAME_INT_CURRENT_PLAYER, currentPlayer.getPlayerNumber());
 		
-		//save strategies
-		savedGame.put(SAVED_GAME_STRING_OPPONENT_ONE_STRATEGY, opponentOne.getStrategy());
-		savedGame.put(SAVED_GAME_STRING_OPPONENT_TWO_STRATEGY, opponentTwo.getStrategy());
-		savedGame.put(SAVED_GAME_STRING_OPPONENT_THREE_STRATEGY, opponentThree.getStrategy());
-		
 		//exitedOnChallenge stuff
 		boolean exitedOnChallenge = currentlyOnChallenge;
 		
@@ -627,9 +621,9 @@ public void continueGame(BidListCellRenderer bidRenderer)
 			displayHands();
 
 			//set the strategies
-			opponentOne.setStrategy(savedGame.get(SAVED_GAME_STRING_OPPONENT_ONE_STRATEGY, "Basic"));
-			opponentTwo.setStrategy(savedGame.get(SAVED_GAME_STRING_OPPONENT_TWO_STRATEGY, "Basic"));
-			opponentThree.setStrategy(savedGame.get(SAVED_GAME_STRING_OPPONENT_THREE_STRATEGY, "Basic"));
+			opponentOne.setStrategy(getStrategy(PreferenceSetting.OpponentOneStrategy));
+			opponentTwo.setStrategy(getStrategy(PreferenceSetting.OpponentTwoStrategy));
+			opponentThree.setStrategy(getStrategy(PreferenceSetting.OpponentThreeStrategy));
 			
 			personToStart = savedGame.getInt(SAVED_GAME_INT_PERSON_TO_START, 0);
 			handPanel.assignAsteriskToStartingPlayer(personToStart);
@@ -1125,7 +1119,7 @@ public void run()
 				String info = opponent.getName() + " has had their strategy reset to "
 							+ CpuStrategies.STRATEGY_BASIC;
 				DialogUtil.showInfo(info);
-				opponent.setStrategy(CpuStrategies.STRATEGY_BASIC);
+				opponent.setStrategy(new InBuiltStrategy(CpuStrategies.STRATEGY_BASIC));
 				action = CpuStrategies.processOpponentTurn(parms, opponent);
 			}
 			
diff --git a/client/src/main/java/screen/MainScreen.java b/client/src/main/java/screen/MainScreen.java
index e1f2696d..baf5af35 100644
--- a/client/src/main/java/screen/MainScreen.java
+++ b/client/src/main/java/screen/MainScreen.java
@@ -39,6 +39,7 @@
 import static screen.ScreenCacheKt.IN_GAME_REPLAY;
 import static screen.online.PlayOnlineDialogKt.showPlayOnlineDialog;
 import static util.ClientGlobals.achievementStore;
+import static util.ClientGlobals.preferenceStore;
 import static utils.CoreGlobals.logger;
 import static utils.ThreadUtilKt.dumpThreadStacks;
 
@@ -675,9 +676,9 @@ public String processCommand(String command)
 		} else if (command.startsWith("server ")) {
 			var serverCommand = command.replace("server ", "");
 			ClientGlobals.INSTANCE.getDevApi().doServerCommand(serverCommand);
-		} else if (command.equals("keygen")) {
-			var key = KeyGeneratorUtil.generateSymmetricKey();
-			textToShow = EncryptionUtil.convertSecretKeyToString(key);
+		} else if (command.equals("clearprefs")) {
+			preferenceStore.clear();
+			logger.info("preferenceStore.cleared", "Cleared all preferences");
 		}
 		else if (command.equals("simulator"))
 		{
diff --git a/client/src/main/java/screen/SimulationDialog.java b/client/src/main/java/screen/SimulationDialog.java
index 37e41252..77b64c13 100644
--- a/client/src/main/java/screen/SimulationDialog.java
+++ b/client/src/main/java/screen/SimulationDialog.java
@@ -1,8 +1,10 @@
 package screen;
 
+import bean.ComboBoxItem;
 import bean.NumberField;
 import game.GameMode;
 import game.GameSettings;
+import strategy.IStrategy;
 import util.*;
 
 import javax.swing.*;
@@ -12,6 +14,8 @@
 import java.util.HashMap;
 import java.util.Vector;
 
+import static strategy.StrategyUtilKt.getSelectedStrategy;
+import static strategy.StrategyUtilKt.getStrategiesComboBoxModel;
 import static utils.CoreGlobals.logger;
 
 public class SimulationDialog extends JDialog
@@ -175,10 +179,10 @@ public SimulationDialog()
 	private final JPanel cpuPanel = new JPanel();
 	private final JCheckBox cbOpponentTwo = new JCheckBox();
 	private final JCheckBox cbOpponentThree = new JCheckBox();
-	private final JComboBox<String> opponentOneStrat = new JComboBox<>();
-	private final JComboBox<String> opponentTwoStrat = new JComboBox<>();
-	private final JComboBox<String> opponentThreeStrat = new JComboBox<>();
-	private final JComboBox<String> opponentZeroStrat = new JComboBox<>();
+	private final JComboBox<ComboBoxItem<IStrategy>> opponentOneStrat = new JComboBox<>();
+	private final JComboBox<ComboBoxItem<IStrategy>> opponentTwoStrat = new JComboBox<>();
+	private final JComboBox<ComboBoxItem<IStrategy>> opponentThreeStrat = new JComboBox<>();
+	private final JComboBox<ComboBoxItem<IStrategy>> opponentZeroStrat = new JComboBox<>();
 	private final JLabel lblTimeTaken = new JLabel("<Time Taken>");
 	private final Checkbox cbLogging = new Checkbox("Enable Logging");
 	private final Checkbox cbForceStart = new Checkbox("CPU 0 Starts");
@@ -374,7 +378,7 @@ public String getToolTipText(MouseEvent e) {
 		resultsTable.setFillsViewportHeight(true);
 	}
 	
-	private void addRowIfApplicable(Vector<Vector<String>> resultsData, String strategy, int opponentNumber)
+	private void addRowIfApplicable(Vector<Vector<String>> resultsData, IStrategy strategy, int opponentNumber)
 	{
 		SimulationResults results = hmSimulationResultsByOpponentNumber.get(opponentNumber);
 		if (results != null)
@@ -515,25 +519,24 @@ public void actionPerformed(ActionEvent arg0)
 	
 	private void updateStrategySelection()
 	{
-		Vector<String> allStrategies = CpuStrategies.getAllStrategies(rdbtnEntropy.isSelected(), null);
-			
-		ComboBoxModel<String> comboModel = new DefaultComboBoxModel<>(allStrategies);
-		opponentZeroStrat.setModel(comboModel);
-		comboModel = new DefaultComboBoxModel<>(allStrategies);
-		opponentOneStrat.setModel(comboModel);
-		comboModel = new DefaultComboBoxModel<>(allStrategies);
-		opponentTwoStrat.setModel(comboModel);
-		comboModel = new DefaultComboBoxModel<>(allStrategies);
-		opponentThreeStrat.setModel(comboModel);
+		opponentZeroStrat.setModel(getStrategiesComboBoxModel(getSelectedGameMode()));
+		opponentOneStrat.setModel(getStrategiesComboBoxModel(getSelectedGameMode()));
+		opponentTwoStrat.setModel(getStrategiesComboBoxModel(getSelectedGameMode()));
+		opponentThreeStrat.setModel(getStrategiesComboBoxModel(getSelectedGameMode()));
 	}
-	
-	private SimulationParams factorySimulationParms()
-	{
-		GameMode gameMode = GameMode.Entropy;
+
+	private GameMode getSelectedGameMode() {
 		if (rdbtnVectropy.isSelected())
 		{
-			gameMode = GameMode.Vectropy;
+			return GameMode.Vectropy;
 		}
+
+		return GameMode.Entropy;
+	}
+	
+	private SimulationParams factorySimulationParms()
+	{
+		GameMode gameMode = getSelectedGameMode();
 		
 		int numberOfCards = slider.getValue();
 		boolean includeJokers = cbIncludeJokers.isSelected();
@@ -545,18 +548,16 @@ private SimulationParams factorySimulationParms()
 		boolean cardReveal = chckbxCardReveal.isSelected();
 		boolean opponentTwoEnabled = cbOpponentTwo.isSelected();
 		boolean opponentThreeEnabled = cbOpponentThree.isSelected();
-		String opponentZeroStrategy = (String) opponentZeroStrat.getSelectedItem();
-		String opponentOneStrategy = (String) opponentOneStrat.getSelectedItem();
-		String opponentTwoStrategy = (String) opponentTwoStrat.getSelectedItem();
-		String opponentThreeStrategy = (String) opponentThreeStrat.getSelectedItem();
 		boolean forceStart = cbForceStart.getState();
 		boolean randomiseOrder = cbRandomiseOrder.getState();
 		boolean enableLogging = cbLogging.getState();
 
 		var settings = new GameSettings(gameMode, numberOfCards, jokerQuantity, jokerValue, includeMoons, includeStars, negativeJacks, cardReveal, false);
 
-		return new SimulationParams(settings, opponentTwoEnabled, opponentThreeEnabled, opponentZeroStrategy, opponentOneStrategy,
-				opponentTwoStrategy, opponentThreeStrategy, enableLogging, randomiseOrder, forceStart);
+		return new SimulationParams(settings, opponentTwoEnabled, opponentThreeEnabled,
+				getSelectedStrategy(opponentZeroStrat), getSelectedStrategy(opponentOneStrat),
+				getSelectedStrategy(opponentTwoStrat), getSelectedStrategy(opponentThreeStrat),
+				enableLogging, randomiseOrder, forceStart);
 	}
 	
 	private void dumpSimulationDetails(int i, int numberOfGames, SimulationParams parms)
diff --git a/client/src/main/java/util/ApiUtil.java b/client/src/main/java/util/ApiUtil.java
index 10234324..6e624715 100644
--- a/client/src/main/java/util/ApiUtil.java
+++ b/client/src/main/java/util/ApiUtil.java
@@ -1,15 +1,11 @@
 package util;
 
-import game.BidAction;
-import game.GameMode;
 import game.PlayerAction;
-import object.ApiStrategy;
 import object.Player;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import preference.PreferenceSetting;
-import settings.Setting;
+import strategy.ApiStrategy;
+import strategy.StrategyParams;
+import strategy.StrategyUtilKt;
 import utils.CoreGlobals;
 
 import javax.swing.*;
@@ -20,31 +16,12 @@
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
-import java.util.*;
-
-import static preference.PreferenceSettingKt.getPreference;
-import static util.ClientGlobals.preferenceStore;
+import java.util.HashMap;
+import java.util.UUID;
 
 public class ApiUtil
 {
-	public static final String API_PREFIX = "API: ";
-	public static final String MESSAGE_TYPE_XML = "XML";
-	public static final String MESSAGE_TYPE_JSON = "JSON";
-	
-	private static final String ROOT_TAG_API_MESSAGE = "ApiMessage";
 	private static final InetAddress INET_ADDRESS_LOCALHOST = MessageUtil.factoryInetAddress("localhost");
-
-	private static final String PREFERENCES_TAG_API = "Api";
-	private static final String PREFERENCES_ATTR_API_NAME = "ApiName";
-	private static final String PREFERENCES_ATTR_PORT_NUMNER = "PortNumber";
-	private static final String PREFERENCES_ATTR_MESSAGE_TYPE = "MessageType";
-	private static final String PREFERENCES_ATTR_SUPPORTS_ENTROPY = "Entropy";
-	private static final String PREFERENCES_ATTR_SUPPORTS_VECTROPY = "Vectropy";
-	private static final String PREFERENCES_ATTR_ERROR = "Error";
-	
-	//Cache this for speed in the simulator
-	private static HashMap<String, ApiStrategy> hmNameToApiStrategy = null;
-	private static ApiStrategy apiStrategy = null;
 	
 	public static void sendTestMessage(int port, boolean xml)
 	{
@@ -56,28 +33,26 @@ public static void sendTestMessage(int port, boolean xml)
 		
 		Document xmlDoc = XmlUtil.factorySimpleMessage("ApiTest");
 		String messageString = XmlUtil.getStringFromDocument(xmlDoc);
-		sendWithCatch(messageString, port, true, true);
+		sendWithCatch(messageString, port, true, null);
 	}
 	
-	public static PlayerAction processApiTurn(StrategyParams parms, Player player)
+	public static PlayerAction processApiTurn(StrategyParams parms, ApiStrategy strategy)
 	{
-		apiStrategy = getApiStrategy(player.getStrategy());
-		int port = apiStrategy.getPortNumber();
-		String messageType = apiStrategy.getMessageType();
+		int port = strategy.getPort();
 		
-		String messageString = factoryApiMessage(parms, player, messageType);
+		String messageString = "some message TODO";
 		
-		String responseString = sendWithCatch(messageString, port, parms.getLogging(), false);
+		String responseString = sendWithCatch(messageString, port, parms.getLogging(), strategy.getId());
 		if (responseString == null)
 		{
 			//An error occurred which we'll already have caught.
 			return null;
 		}
 		
-		return handleResponse(responseString);
+		return handleResponse(responseString, strategy.getId());
 	}
 	
-	private static String sendWithCatch(String messageString, int port, boolean logging, boolean testMode)
+	private static String sendWithCatch(String messageString, int port, boolean logging, UUID id)
 	{
 		Debug.append("API OUT: " + messageString, logging);
 		
@@ -105,11 +80,11 @@ private static String sendWithCatch(String messageString, int port, boolean logg
 			int option = DialogUtilNew.showQuestion(question, false);
 			if (option == JOptionPane.YES_OPTION)
 			{
-				sendWithCatch(messageString, port, logging, testMode);
+				sendWithCatch(messageString, port, logging, id);
 			}
-			else if (!testMode)
+			else if (id != null)
 			{
-				saveStrategyErrorAndUnsetStrategies(apiStrategy, "An error occurred connecting to the third party software.");
+				StrategyUtilKt.saveStrategyErrorAndUnsetStrategies(id, "An error occurred connecting to the third party software.");
 			}
 		}
 		catch (Throwable t)
@@ -123,8 +98,10 @@ else if (!testMode)
 			Debug.stackTrace(t);
 			DialogUtilNew.showError("A severe error occurred communicating with the third party software. "
 								+ "\n\nLogs have been sent for investigation.");
-			
-			saveStrategyErrorAndUnsetStrategies(apiStrategy, "A severe error occurred communicating with the third party software.");
+
+			if (id != null) {
+				StrategyUtilKt.saveStrategyErrorAndUnsetStrategies(id, "A severe error occurred communicating with the third party software.");
+			}
 		}
 		finally
 		{
@@ -137,267 +114,102 @@ else if (!testMode)
 		return responseString;
 	}
 	
-	private static String factoryApiMessage(StrategyParams parms, Player player, String messageType)
-	{
-		if (messageType.equals(MESSAGE_TYPE_XML))
-		{
-			return factoryXmlApiMessage(parms, player);
-		}
-		
-		return factoryJsonApiMessage(parms, player);
-	}
-	
-	private static String factoryXmlApiMessage(StrategyParams parms, Player player)
-	{
-		Document document = XmlUtil.factoryNewDocument();
-		Element rootElement = document.createElement(ROOT_TAG_API_MESSAGE);
-
-		var settings = parms.getSettings();
-		GameMode gameMode = settings.getMode();
-		int totalCards = parms.getCardsInPlay();
-		int jokerQuantity = settings.getJokerQuantity();
-		int jokerValue = settings.getJokerValue();
-		boolean includeMoons = settings.getIncludeMoons();
-		boolean includeStars = settings.getIncludeStars();
-		boolean negativeJacks = settings.getNegativeJacks();
-		boolean cardReveal = settings.getCardReveal();
-		BidAction lastBid = parms.getLastBid();
-
-		rootElement.setAttribute("GameMode", gameMode.name());
-		
-		List<String> playerHand = player.getHand();
-		Element handElement = document.createElement("PlayerHand");
-		int length = playerHand.size();
-		for (int i=0; i<length; i++)
-		{
-			handElement.setAttribute("Card-" + i, playerHand.get(i));
-		}
-		
-		rootElement.appendChild(handElement);
-		
-		//add stuff
-		rootElement.setAttribute("TotalCards", "" + totalCards);
-		
-		if (jokerQuantity > 0)
-		{
-			rootElement.setAttribute("JokerQuantity", "" + jokerQuantity);
-			rootElement.setAttribute("JokerValue", "" + jokerValue);
-		}
-		
-		XmlUtil.setAttributeBoolean(rootElement, "IncludeMoons", includeMoons);
-		XmlUtil.setAttributeBoolean(rootElement, "IncludeStars", includeStars);
-		XmlUtil.setAttributeBoolean(rootElement, "NegativeJacks", negativeJacks);
-		XmlUtil.setAttributeBoolean(rootElement, "ShowCards", cardReveal);
-		
-		if (cardReveal)
-		{
-			Element opponentCardsOnShow = document.createElement("OpponentCardsOnShow");
-			List<String> cards = parms.getOpponentCardsOnShow();
-			for (int i=0; i<cards.size(); i++)
-			{
-				opponentCardsOnShow.setAttribute("Card-" + i, cards.get(i));
-			}
-			
-			if (cards.size() > 0)
-			{
-				rootElement.appendChild(opponentCardsOnShow);
-			}
-			
-			Element myCardsAlreadyShowing = document.createElement("PlayerCardsOnShow");
-			cards = player.getRevealedCards();
-			for (int i=0; i<cards.size(); i++)
-			{
-				myCardsAlreadyShowing.setAttribute("Card-" + i, cards.get(i));
-			}
-			
-			if (cards.size() > 0)
-			{
-				rootElement.appendChild(myCardsAlreadyShowing);
-			}
-		}
-		
-		if (lastBid != null)
-		{
-			rootElement.setAttribute("LastBid", lastBid.toJsonString());
-		}
-		
-		document.appendChild(rootElement);
-		return XmlUtil.getStringFromDocument(document);
-	}
-	
-	private static String factoryJsonApiMessage(StrategyParams parms, Player player)
-	{
-		if (parms == null
-		  || player == null)
-		{
-			//Empty if block to avoid warnings
-		}
-		
-		return null;
-	}
-	
-	private static PlayerAction handleResponse(String responseString)
+//	private static String factoryXmlApiMessage(StrategyParams parms, Player player)
+//	{
+//		Document document = XmlUtil.factoryNewDocument();
+//		Element rootElement = document.createElement(ROOT_TAG_API_MESSAGE);
+//
+//		var settings = parms.getSettings();
+//		GameMode gameMode = settings.getMode();
+//		int totalCards = parms.getCardsInPlay();
+//		int jokerQuantity = settings.getJokerQuantity();
+//		int jokerValue = settings.getJokerValue();
+//		boolean includeMoons = settings.getIncludeMoons();
+//		boolean includeStars = settings.getIncludeStars();
+//		boolean negativeJacks = settings.getNegativeJacks();
+//		boolean cardReveal = settings.getCardReveal();
+//		BidAction lastBid = parms.getLastBid();
+//
+//		rootElement.setAttribute("GameMode", gameMode.name());
+//
+//		List<String> playerHand = player.getHand();
+//		Element handElement = document.createElement("PlayerHand");
+//		int length = playerHand.size();
+//		for (int i=0; i<length; i++)
+//		{
+//			handElement.setAttribute("Card-" + i, playerHand.get(i));
+//		}
+//
+//		rootElement.appendChild(handElement);
+//
+//		//add stuff
+//		rootElement.setAttribute("TotalCards", "" + totalCards);
+//
+//		if (jokerQuantity > 0)
+//		{
+//			rootElement.setAttribute("JokerQuantity", "" + jokerQuantity);
+//			rootElement.setAttribute("JokerValue", "" + jokerValue);
+//		}
+//
+//		XmlUtil.setAttributeBoolean(rootElement, "IncludeMoons", includeMoons);
+//		XmlUtil.setAttributeBoolean(rootElement, "IncludeStars", includeStars);
+//		XmlUtil.setAttributeBoolean(rootElement, "NegativeJacks", negativeJacks);
+//		XmlUtil.setAttributeBoolean(rootElement, "ShowCards", cardReveal);
+//
+//		if (cardReveal)
+//		{
+//			Element opponentCardsOnShow = document.createElement("OpponentCardsOnShow");
+//			List<String> cards = parms.getOpponentCardsOnShow();
+//			for (int i=0; i<cards.size(); i++)
+//			{
+//				opponentCardsOnShow.setAttribute("Card-" + i, cards.get(i));
+//			}
+//
+//			if (cards.size() > 0)
+//			{
+//				rootElement.appendChild(opponentCardsOnShow);
+//			}
+//
+//			Element myCardsAlreadyShowing = document.createElement("PlayerCardsOnShow");
+//			cards = player.getRevealedCards();
+//			for (int i=0; i<cards.size(); i++)
+//			{
+//				myCardsAlreadyShowing.setAttribute("Card-" + i, cards.get(i));
+//			}
+//
+//			if (cards.size() > 0)
+//			{
+//				rootElement.appendChild(myCardsAlreadyShowing);
+//			}
+//		}
+//
+//		if (lastBid != null)
+//		{
+//			rootElement.setAttribute("LastBid", lastBid.toJsonString());
+//		}
+//
+//		document.appendChild(rootElement);
+//		return XmlUtil.getStringFromDocument(document);
+//	}
+	
+	private static PlayerAction handleResponse(String responseString, UUID id)
 	{
 		try {
 			return CoreGlobals.jsonMapper.readValue(responseString, PlayerAction.class);
 		} catch (Exception e) {
-			showMalformedResponseError(responseString);
+			showMalformedResponseError(responseString, id);
 			return null;
 		}
 	}
 	
-	private static void showMalformedResponseError(String response)
+	private static void showMalformedResponseError(String response, UUID id)
 	{
 		String message = "The third-party software returned an unexpected message type:"
 					   + "\n\n" + response;
 		
-		saveStrategyErrorAndUnsetStrategies(apiStrategy, message);
+		StrategyUtilKt.saveStrategyErrorAndUnsetStrategies(id, message);
 		
 		message += "\n\nRefer to the API documentation to see the responses that are accepted.";
 		DialogUtilNew.showError(message);
 	}
-	
-	private static void initialiseStrategyHashMap()
-	{
-		HashMap<String, ApiStrategy> temp = new HashMap<>();
-
-		String apiStrategies = getPreference(PreferenceSetting.ApiStrategies);
-		if (apiStrategies.isBlank()) {
-			return;
-		}
-
-		Document apiXml = XmlUtil.getDocumentFromXmlString(apiStrategies);
-		if (apiXml == null)
-		{
-			hmNameToApiStrategy = temp;
-			return;
-		}
-		
-		Element rootElement = apiXml.getDocumentElement();
-		NodeList strategyTags = rootElement.getElementsByTagName(PREFERENCES_TAG_API);
-		int size = strategyTags.getLength();
-		for (int i=0; i<size; i++)
-		{
-			Element strategyTag = (Element)strategyTags.item(i);
-			String name = strategyTag.getAttribute(PREFERENCES_ATTR_API_NAME);
-			String error = strategyTag.getAttribute(PREFERENCES_ATTR_ERROR);
-			int portNumber = XmlUtil.getAttributeInt(strategyTag, PREFERENCES_ATTR_PORT_NUMNER);
-			String messageType = strategyTag.getAttribute(PREFERENCES_ATTR_MESSAGE_TYPE);
-			boolean entropy = XmlUtil.getAttributeBoolean(strategyTag, PREFERENCES_ATTR_SUPPORTS_ENTROPY);
-			boolean vectropy = XmlUtil.getAttributeBoolean(strategyTag, PREFERENCES_ATTR_SUPPORTS_VECTROPY);
-			
-			ApiStrategy strategy = new ApiStrategy();
-			strategy.setName(name);
-			strategy.setError(error);
-			strategy.setPortNumber(portNumber);
-			strategy.setEntropy(entropy);
-			strategy.setVectropy(vectropy);
-			strategy.setMessageType(messageType);
-			
-			temp.put(name, strategy);
-		}
-		
-		hmNameToApiStrategy = temp;
-	}
-	
-	public static ArrayList<ApiStrategy> getApiStrategiesFromPreferences()
-	{
-		ArrayList<ApiStrategy> strategies = new ArrayList<>();
-		if (hmNameToApiStrategy == null)
-		{
-			initialiseStrategyHashMap();
-		}
-		
-		Iterator<Map.Entry<String, ApiStrategy>> it = hmNameToApiStrategy.entrySet().iterator();
-		for (; it.hasNext(); )
-		{
-			Map.Entry<String, ApiStrategy> entry = it.next();
-			ApiStrategy strategy = entry.getValue();
-			strategies.add(strategy);
-		}
-		
-		return strategies;
-	}
-	
-	public static ApiStrategy getApiStrategy(String name)
-	{
-		if (hmNameToApiStrategy == null)
-		{
-			initialiseStrategyHashMap();
-		}
-		
-		int prefixLength = API_PREFIX.length();
-		int totalLength = name.length();
-		name = name.substring(prefixLength, totalLength);
-		
-		return hmNameToApiStrategy.get(name);
-	}
-	
-	public static void saveApiStrategiesToPreferences(List<ApiStrategy> strategies)
-	{
-		//Construct a document with any old root element
-		Document apiDoc = XmlUtil.factoryNewDocument();
-		Element rootElement = apiDoc.createElement("ApiStrategies");
-		
-		int size = strategies.size();
-		for (int i=0; i<size; i++)
-		{
-			ApiStrategy strategy = strategies.get(i);
-			
-			Element strategyTag = apiDoc.createElement(PREFERENCES_TAG_API);
-			strategyTag.setAttribute(PREFERENCES_ATTR_API_NAME, strategy.getName());
-			strategyTag.setAttribute(PREFERENCES_ATTR_ERROR, strategy.getError());
-			strategyTag.setAttribute(PREFERENCES_ATTR_MESSAGE_TYPE, strategy.getMessageType());
-			strategyTag.setAttribute(PREFERENCES_ATTR_PORT_NUMNER, "" + strategy.getPortNumber());
-			XmlUtil.setAttributeBoolean(strategyTag, PREFERENCES_ATTR_SUPPORTS_ENTROPY, strategy.getEntropy());
-			XmlUtil.setAttributeBoolean(strategyTag, PREFERENCES_ATTR_SUPPORTS_VECTROPY, strategy.getVectropy());
-			
-			rootElement.appendChild(strategyTag);
-		}
-		
-		//Append the root, which has all the strategies within it
-		apiDoc.appendChild(rootElement);
-		
-		//Save to the Registry
-		String xmlStr = XmlUtil.getStringFromDocument(apiDoc);
-		preferenceStore.save(PreferenceSetting.ApiStrategies, xmlStr);
-		
-		//Clear the cache
-		clearCache();
-	}
-	
-	public static void clearCache()
-	{
-		hmNameToApiStrategy = null;
-	}
-	
-	public static void saveStrategyErrorAndUnsetStrategies(ApiStrategy strategy, String error)
-	{
-		//Something has gone wrong, so save the API strategy as disabled
-		String name = strategy.getName();
-		ArrayList<ApiStrategy> apiStrategies = getApiStrategiesFromPreferences();
-		for (int i=0; i<apiStrategies.size(); i++)
-		{
-			ApiStrategy savedStrategy = apiStrategies.get(i);
-			if (savedStrategy.getName().equals(name))
-			{
-				savedStrategy.setError(error);
-			}
-		}
-		
-		saveApiStrategiesToPreferences(apiStrategies);
-		
-		resetCpuStrategy(PreferenceSetting.OpponentOneStrategy, name);
-		resetCpuStrategy(PreferenceSetting.OpponentTwoStrategy, name);
-		resetCpuStrategy(PreferenceSetting.OpponentThreeStrategy, name);
-	}
-	
-	private static void resetCpuStrategy(Setting<String> strategySetting, String apiName)
-	{
-		String strategy = getPreference(strategySetting);
-		if (strategy.equals("API: " + apiName))
-		{
-			preferenceStore.save(strategySetting, CpuStrategies.STRATEGY_BASIC);
-		}
-	}
 }
diff --git a/client/src/main/java/util/CpuStrategies.java b/client/src/main/java/util/CpuStrategies.java
index ae030c4f..5bc4ecce 100644
--- a/client/src/main/java/util/CpuStrategies.java
+++ b/client/src/main/java/util/CpuStrategies.java
@@ -2,6 +2,9 @@
 
 import game.*;
 import object.*;
+import strategy.ApiStrategy;
+import strategy.StrategyParams;
+import strategy.StrategyUtilKt;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,48 +18,6 @@ public class CpuStrategies
 	public static final String STRATEGY_BASIC = "Easy";
 	public static final String STRATEGY_EV = "Hard";
 	
-	public static Vector<String> getAllStrategies(boolean entropy, List<ApiStrategy> apiStrategies)
-	{
-		Vector<String> allStrategies = getFixedStrategies(entropy);
-		
-		//Append the relevant API strategies
-		if (apiStrategies == null)
-		{
-			apiStrategies = ApiUtil.getApiStrategiesFromPreferences();
-		}
-		
-		appendRelevantStrategies(allStrategies, apiStrategies, entropy);
-		return allStrategies;
-	}
-	
-	private static void appendRelevantStrategies(Vector<String> allStrategies, 
-	  List<ApiStrategy> apiStrategies, boolean entropy)
-	{
-		int size = apiStrategies.size();
-		for (int i=0; i<size; i++)
-		{
-			ApiStrategy apiStrategy = apiStrategies.get(i);
-			boolean supportsMode = entropy ? apiStrategy.getEntropy():apiStrategy.getVectropy();
-			String error = apiStrategy.getError();
-			if (supportsMode
-			  && error.isEmpty())
-			{
-				String name = ApiUtil.API_PREFIX + apiStrategy.getName();
-				allStrategies.add(name);
-			}
-		}
-	}
-	
-	private static Vector<String> getFixedStrategies(boolean entropy)
-	{
-		if (entropy)
-		{
-			return EntCpuStrategies.getAllStrategies();
-		}
-		
-		return VectCpuStrategies.getAllStrategies();
-	}
-	
 	/**
 	 * Entry-point for strategy code
 	 */
@@ -77,14 +38,14 @@ public static PlayerAction processOpponentTurn(StrategyParams parms, Player oppo
 		String error = validateAction(opponent, action, parms);
 		if (error != null)
 		{
-			if (opponent.isApiStrategy())
+			var strategy = opponent.getStrategy();
+			if (strategy instanceof ApiStrategy)
 			{
 				//Show an error message to help diagnosing.
 				String msg = "The action sent back by the third-party software [" + action + "] "
 				             + "failed validation with the following error:\n\n" + error;
-				
-				String strategyStr = opponent.getStrategy();
-				ApiUtil.saveStrategyErrorAndUnsetStrategies(ApiUtil.getApiStrategy(strategyStr), msg);
+
+				StrategyUtilKt.saveStrategyErrorAndUnsetStrategies(((ApiStrategy) strategy).getId(), msg);
 				DialogUtilNew.showError(msg);
 			}
 			else
@@ -110,9 +71,10 @@ public static PlayerAction processOpponentTurn(StrategyParams parms, Player oppo
 	
 	private static PlayerAction getOpponentBid(StrategyParams parms, Player opponent, boolean entropy)
 	{
-		if (opponent.isApiStrategy())
+		var strategy = opponent.getStrategy();
+		if (strategy instanceof ApiStrategy)
 		{
-			return ApiUtil.processApiTurn(parms, opponent);
+			return ApiUtil.processApiTurn(parms, (ApiStrategy) strategy);
 		}
 		else if (entropy)
 		{
diff --git a/client/src/main/java/util/EntCpuStrategies.java b/client/src/main/java/util/EntCpuStrategies.java
index 61fe9aa0..9cc31891 100644
--- a/client/src/main/java/util/EntCpuStrategies.java
+++ b/client/src/main/java/util/EntCpuStrategies.java
@@ -8,10 +8,11 @@
 import game.Suit;
 import object.Player;
 import strategy.MarkStrategySuitWrapper;
+import strategy.StrategyParams;
 
 import static game.CardsUtilKt.countSuit;
 import static game.EntropyUtilKt.amountRequiredToBid;
-import static game.StrategyUtilKt.*;
+import static strategy.StrategyUtilKt.*;
 import static strategy.MarkStrategySuitWrapperKt.factoryMarkStrategySuitWrapper;
 import static utils.CoreGlobals.logger;
 
@@ -34,7 +35,7 @@ public static Vector<String> getAllStrategies()
 	
 	public static PlayerAction processOpponentTurn(Player opponent, StrategyParams parms)
 	{
-		String strategy = opponent.getStrategy();
+		String strategy = opponent.getStrategy().getName();
 		return processOpponentTurn(strategy, opponent, parms);
 	}
 	private static PlayerAction processOpponentTurn(String strategy, Player opponent, StrategyParams parms)
diff --git a/client/src/main/java/util/ReplayFileUtil.java b/client/src/main/java/util/ReplayFileUtil.java
index 6b2b2d69..c7125380 100644
--- a/client/src/main/java/util/ReplayFileUtil.java
+++ b/client/src/main/java/util/ReplayFileUtil.java
@@ -65,9 +65,6 @@ public final class ReplayFileUtil implements Registry
 	public static final String XML_REPLAY_STRING_OPPONENT_ONE_NAME = "OpponentOneName";
 	public static final String XML_REPLAY_STRING_OPPONENT_TWO_NAME = "OpponentTwoName";
 	public static final String XML_REPLAY_STRING_OPPONENT_THREE_NAME = "OpponentThreeName";
-	public static final String XML_REPLAY_STRING_OPPONENT_ONE_STRATEGY = "OpponentOneStrategy";
-	public static final String XML_REPLAY_STRING_OPPONENT_TWO_STRATEGY = "OpponentTwoStrategy";
-	public static final String XML_REPLAY_STRING_OPPONENT_THREE_STRATEGY = "OpponentThreeStrategy";
 	public static final String XML_REPLAY_STRING_ROOM_NAME = "RoomName";
 	public static final String XML_REPLAY_BOOLEAN_PLAY_BLIND = "PlayBlind";
 	public static final String XML_REPLAY_BOOLEAN_PLAY_WITH_HANDICAP = "PlayWithHandicap";
@@ -248,9 +245,6 @@ private static void appendStandardVariablesToXml(Preferences replay, Element roo
 		boolean includeMoons = replay.getBoolean(REPLAY_BOOLEAN_INCLUDE_MOONS, false);
 		boolean includeStars = replay.getBoolean(REPLAY_BOOLEAN_INCLUDE_STARS, false);
 		boolean cheatUsed = replay.getBoolean(REPLAY_BOOLEAN_CHEAT_USED, false);
-		String opponentOneStrategy = replay.get(REPLAY_STRING_OPPONENT_ONE_STRATEGY, "");
-		String opponentTwoStrategy = replay.get(REPLAY_STRING_OPPONENT_TWO_STRATEGY, "");
-		String opponentThreeStrategy = replay.get(REPLAY_STRING_OPPONENT_THREE_STRATEGY, "");
 		String roomName = replay.get(REPLAY_STRING_ROOM_NAME, "");
 		
 		rootElement.setAttribute(XML_REPLAY_INT_GAME_MODE, "" + mode);
@@ -263,9 +257,6 @@ private static void appendStandardVariablesToXml(Preferences replay, Element roo
 		rootElement.setAttribute(XML_REPLAY_STRING_OPPONENT_TWO_NAME, opponentTwoName);
 		rootElement.setAttribute(XML_REPLAY_STRING_OPPONENT_THREE_NAME, opponentThreeName);
 		rootElement.setAttribute(XML_REPLAY_INT_HANDICAP_AMOUNT, "" + handicapAmount);
-		rootElement.setAttribute(XML_REPLAY_STRING_OPPONENT_ONE_STRATEGY, opponentOneStrategy);
-		rootElement.setAttribute(XML_REPLAY_STRING_OPPONENT_TWO_STRATEGY, opponentTwoStrategy);
-		rootElement.setAttribute(XML_REPLAY_STRING_OPPONENT_THREE_STRATEGY, opponentThreeStrategy);
 		rootElement.setAttribute(XML_REPLAY_STRING_ROOM_NAME, roomName);
 		
 		rootElement.setAttribute(XML_REPLAY_INT_VERSION, "" + ReplayConverter.REPLAY_VERSION);
@@ -556,10 +547,7 @@ public static boolean successfullyFilledRegistryFromFile(String filePath, Prefer
 		String opponentOneName = rootElement.getAttribute(XML_REPLAY_STRING_OPPONENT_ONE_NAME);
 		String opponentTwoName = rootElement.getAttribute(XML_REPLAY_STRING_OPPONENT_TWO_NAME);
 		String opponentThreeName = rootElement.getAttribute(XML_REPLAY_STRING_OPPONENT_THREE_NAME);
-		
-		String opponentOneStrategy = rootElement.getAttribute(XML_REPLAY_STRING_OPPONENT_ONE_STRATEGY);
-		String opponentTwoStrategy = rootElement.getAttribute(XML_REPLAY_STRING_OPPONENT_TWO_STRATEGY);
-		String opponentThreeStrategy = rootElement.getAttribute(XML_REPLAY_STRING_OPPONENT_THREE_STRATEGY);
+
 		String roomName = rootElement.getAttribute(XML_REPLAY_STRING_ROOM_NAME);
 		
 		boolean playBlind = XmlUtil.getAttributeBoolean(rootElement, XML_REPLAY_BOOLEAN_PLAY_BLIND);
@@ -581,9 +569,6 @@ public static boolean successfullyFilledRegistryFromFile(String filePath, Prefer
 			replay.put(REPLAY_STRING_OPPONENT_ONE_NAME, opponentOneName);
 			replay.put(REPLAY_STRING_OPPONENT_TWO_NAME, opponentTwoName);
 			replay.put(REPLAY_STRING_OPPONENT_THREE_NAME, opponentThreeName);
-			replay.put(REPLAY_STRING_OPPONENT_ONE_STRATEGY, opponentOneStrategy);
-			replay.put(REPLAY_STRING_OPPONENT_TWO_STRATEGY, opponentTwoStrategy);
-			replay.put(REPLAY_STRING_OPPONENT_THREE_STRATEGY, opponentThreeStrategy);
 			replay.put(REPLAY_STRING_ROOM_NAME, roomName);
 			replay.putBoolean(REPLAY_BOOLEAN_PLAY_BLIND, playBlind);
 			replay.putBoolean(REPLAY_BOOLEAN_PLAY_WITH_HANDICAP, playWithHandicap);
diff --git a/client/src/main/java/util/VectCpuStrategies.java b/client/src/main/java/util/VectCpuStrategies.java
index 933d522e..ccda37c6 100644
--- a/client/src/main/java/util/VectCpuStrategies.java
+++ b/client/src/main/java/util/VectCpuStrategies.java
@@ -7,8 +7,9 @@
 import game.Suit;
 import game.VectropyBidAction;
 import object.Player;
+import strategy.StrategyParams;
 
-import static game.StrategyUtilKt.*;
+import static strategy.StrategyUtilKt.*;
 import static utils.CoreGlobals.logger;
 
 public class VectCpuStrategies 
@@ -29,7 +30,7 @@ public static Vector<String> getAllStrategies()
 	
 	public static PlayerAction processOpponentTurn(Player opponent, StrategyParams parms)
 	{
-		String strategy = opponent.getStrategy();
+		String strategy = opponent.getStrategy().getName();
 		return processOpponentTurn(strategy, opponent, parms);
 	}
 	private static PlayerAction processOpponentTurn(String strategy, Player opponent, StrategyParams parms)
diff --git a/client/src/main/kotlin/preference/PreferenceSetting.kt b/client/src/main/kotlin/preference/PreferenceSetting.kt
index b06ce523..c417a19b 100644
--- a/client/src/main/kotlin/preference/PreferenceSetting.kt
+++ b/client/src/main/kotlin/preference/PreferenceSetting.kt
@@ -1,8 +1,10 @@
 package preference
 
+import com.fasterxml.jackson.module.kotlin.readValue
 import settings.Setting
 import util.ClientGlobals.preferenceStore
 import util.CpuStrategies.STRATEGY_BASIC
+import utils.CoreGlobals.jsonMapper
 
 const val TWO_COLOURS = "twocolour"
 const val FOUR_COLOURS = "fourcolour"
@@ -17,6 +19,24 @@ const val GAME_SPEED_FAST = 500
 
 fun <T : Any> getPreference(setting: Setting<T>) = preferenceStore.get(setting)
 
+inline fun <reified T : Any> getJsonPreference(setting: Setting<String>): T? {
+    val raw = getPreference(setting)
+    return jsonMapper.readValue<T>(raw)
+}
+
+inline fun <reified T : Any> findJsonPreference(setting: Setting<String>): T? {
+    val raw = getPreference(setting)
+    if (raw.isEmpty()) {
+        return null
+    }
+
+    return jsonMapper.readValue<T>(raw)
+}
+
+fun saveJsonPreference(setting: Setting<String>, rawValue: Any) {
+    preferenceStore.save(setting, jsonMapper.writeValueAsString(rawValue))
+}
+
 object PreferenceSetting {
     // Gameplay
     @JvmField val GameMode = Setting("gameMode", game.GameMode.Entropy.name)
diff --git a/client/src/main/kotlin/screen/ApiAmendDialog.kt b/client/src/main/kotlin/screen/ApiAmendDialog.kt
new file mode 100644
index 00000000..56813f14
--- /dev/null
+++ b/client/src/main/kotlin/screen/ApiAmendDialog.kt
@@ -0,0 +1,158 @@
+package screen
+
+import game.GameMode
+import java.awt.BorderLayout
+import java.awt.event.ActionEvent
+import java.awt.event.ActionListener
+import javax.swing.JButton
+import javax.swing.JCheckBox
+import javax.swing.JLabel
+import javax.swing.JPanel
+import javax.swing.JTextField
+import strategy.ApiStrategy
+import util.ApiUtil
+import util.DialogUtilNew
+
+class ApiAmendDialog : SimpleDialog(), ActionListener {
+    private var apiStrategy: ApiStrategy? = null
+
+    private val okCancelPanel = JPanel()
+    private val panel = JPanel()
+    private val lblName = JLabel("Name")
+    private val textFieldName = JTextField()
+    private val lblGameMode = JLabel("Game Mode")
+    private val rdbtnEntropy = JCheckBox("Entropy")
+    private val rdbtnVectropy = JCheckBox("Vectropy")
+    private val lblPort = JLabel("Port")
+    private val textFieldPort = JTextField()
+    private val lblMessageType = JLabel("Messaging")
+    private val btnTest = JButton("Test")
+
+    private val modeMappings =
+        listOf(rdbtnEntropy to GameMode.Entropy, rdbtnVectropy to GameMode.Vectropy)
+
+    init {
+        title = "API Setup"
+        setSize(350, 300)
+        setLocationRelativeTo(null)
+        isResizable = false
+        isModal = true
+
+        contentPane.add(okCancelPanel, BorderLayout.SOUTH)
+        okCancelPanel.add(btnOk)
+        okCancelPanel.add(btnCancel)
+        contentPane.add(panel, BorderLayout.CENTER)
+        panel.layout = null
+        lblName.setBounds(10, 10, 100, 25)
+        panel.add(lblName)
+        lblGameMode.setBounds(10, 45, 100, 25)
+        panel.add(lblGameMode)
+        rdbtnEntropy.setBounds(110, 45, 80, 25)
+        panel.add(rdbtnEntropy)
+        rdbtnVectropy.setBounds(190, 45, 80, 25)
+        panel.add(rdbtnVectropy)
+        textFieldName.setBounds(110, 10, 120, 25)
+        panel.add(textFieldName)
+        textFieldName.columns = 10
+        lblPort.setBounds(10, 80, 100, 25)
+        panel.add(lblPort)
+        textFieldPort.setBounds(110, 80, 80, 25)
+        panel.add(textFieldPort)
+        textFieldPort.columns = 10
+        lblMessageType.setBounds(10, 115, 100, 25)
+        panel.add(lblMessageType)
+        btnTest.setBounds(120, 172, 89, 23)
+        panel.add(btnTest)
+
+        btnTest.addActionListener(this)
+    }
+
+    fun init(strategy: ApiStrategy?) {
+        this.apiStrategy = strategy
+
+        if (strategy == null) {
+            textFieldName.text = ""
+            textFieldPort.text = "" + DEFAULT_PORT_NUMBER
+            rdbtnEntropy.isSelected = true
+        } else {
+            textFieldName.text = strategy.name
+            textFieldPort.text = "" + strategy.port
+
+            rdbtnEntropy.isSelected = strategy.supportedModes.contains(GameMode.Entropy)
+            rdbtnVectropy.isSelected = strategy.supportedModes.contains(GameMode.Vectropy)
+        }
+    }
+
+    override fun okPressed() {
+        if (valid()) {
+            saveData()
+        }
+    }
+
+    override fun actionPerformed(arg0: ActionEvent) {
+        if (arg0.source === btnTest) {
+            sendTestMessage()
+        } else {
+            super.actionPerformed(arg0)
+        }
+    }
+
+    private fun valid(): Boolean {
+        val name = textFieldName.text
+        if (name.isEmpty()) {
+            DialogUtilNew.showError("You must enter a name for this setup.")
+            return false
+        }
+
+        if (!rdbtnEntropy.isSelected && !rdbtnVectropy.isSelected) {
+            DialogUtilNew.showError("You must select at least one game mode.", this)
+            return false
+        }
+
+        return true
+    }
+
+    private fun saveData() {
+        val supportedModes = modeMappings.filter { it.first.isSelected }.map { it.second }
+        apiStrategy = ApiStrategy(textFieldName.text, supportedModes, textFieldPort.text.toInt())
+
+        dispose()
+    }
+
+    private fun sendTestMessage() {
+        val infoMsg =
+            """
+            About to send a test message on port ${textFieldPort.text}
+            
+            Ensure that the third-party software is running and listening on this port.
+            """
+                .trimIndent()
+
+        DialogUtilNew.showInfo(infoMsg)
+
+        val portStr = textFieldPort.text
+        val port = portStr.toInt()
+
+        ApiUtil.sendTestMessage(port, true)
+    }
+
+    companion object {
+        private const val DEFAULT_PORT_NUMBER = 1153
+
+        fun createStrategy(): ApiStrategy? {
+            val dialog = ApiAmendDialog()
+            dialog.init(null)
+            dialog.isVisible = true
+
+            return dialog.apiStrategy
+        }
+
+        fun amendStrategy(strategy: ApiStrategy): ApiStrategy? {
+            val dialog = ApiAmendDialog()
+            dialog.init(strategy)
+            dialog.isVisible = true
+
+            return dialog.apiStrategy
+        }
+    }
+}
diff --git a/client/src/main/kotlin/screen/preference/PreferencesDialog.kt b/client/src/main/kotlin/screen/preference/PreferencesDialog.kt
index 27c1f029..9c79d7fd 100644
--- a/client/src/main/kotlin/screen/preference/PreferencesDialog.kt
+++ b/client/src/main/kotlin/screen/preference/PreferencesDialog.kt
@@ -8,7 +8,6 @@ import javax.swing.JScrollPane
 import javax.swing.JTabbedPane
 import javax.swing.SwingConstants
 import screen.SimpleDialog
-import util.ApiUtil
 import utils.getAllChildComponentsForType
 
 class PreferencesDialog : SimpleDialog() {
@@ -68,7 +67,6 @@ class PreferencesDialog : SimpleDialog() {
     }
 
     private fun closeDialog() {
-        ApiUtil.clearCache()
         dispose()
     }
 }
diff --git a/client/src/main/kotlin/screen/preference/PreferencesPanelPlayers.kt b/client/src/main/kotlin/screen/preference/PreferencesPanelPlayers.kt
index 138e7119..627a1a66 100644
--- a/client/src/main/kotlin/screen/preference/PreferencesPanelPlayers.kt
+++ b/client/src/main/kotlin/screen/preference/PreferencesPanelPlayers.kt
@@ -1,14 +1,11 @@
 package screen.preference
 
+import bean.ComboBoxItem
 import game.GameMode
 import java.awt.Font
 import java.awt.event.ActionEvent
-import java.awt.event.ItemEvent
-import java.awt.event.ItemListener
 import java.awt.event.MouseEvent
 import java.awt.event.MouseListener
-import javax.swing.ComboBoxModel
-import javax.swing.DefaultComboBoxModel
 import javax.swing.JButton
 import javax.swing.JCheckBox
 import javax.swing.JComboBox
@@ -25,29 +22,26 @@ import javax.swing.SwingConstants
 import javax.swing.SwingUtilities
 import javax.swing.table.TableModel
 import javax.swing.table.TableRowSorter
-import `object`.ApiStrategy
 import `object`.LimitedDocument
 import preference.PreferenceSetting
 import preference.getPreference
+import preference.saveJsonPreference
 import screen.ApiAmendDialog
-import util.ApiUtil
+import strategy.ApiStrategy
+import strategy.IStrategy
+import strategy.getApiStrategiesFromPreferences
+import strategy.getSelectedStrategy
+import strategy.getStrategiesComboBoxModel
+import strategy.getStrategy
+import strategy.saveApiStrategiesToPreference
+import strategy.toComboBoxItem
 import util.ClientGlobals.preferenceStore
-import util.CpuStrategies
 import util.DialogUtilNew
 import util.TableUtil.DefaultModel
 import util.TableUtil.SimpleRenderer
 
 class PreferencesPanelPlayers(parent: PreferencesDialog) :
-    AbstractPreferencesPanel(parent), MouseListener, ItemListener {
-    private var playerName = "Player"
-    private var opponentOneName = "Mark"
-    private var opponentTwoName = "Dave"
-    private var opponentThreeName = "Tom"
-    private var opponentTwoEnabled = false
-    private var opponentThreeEnabled = false
-    private var opponentOneStrategy: String = "Mark"
-    private var opponentTwoStrategy: String = "Basic"
-    private var opponentThreeStrategy: String = "Basic"
+    AbstractPreferencesPanel(parent), MouseListener {
     private var apiStrategies: List<ApiStrategy> = emptyList()
     private var gameMode: GameMode = GameMode.Entropy
 
@@ -60,9 +54,9 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
     private val opponentThreeNameField = JTextField()
     private val cbOpponentTwo = JCheckBox()
     private val cbOpponentThree = JCheckBox()
-    private val opponentOneStrat = JComboBox<String?>()
-    private val opponentTwoStrat = JComboBox<String?>()
-    private val opponentThreeStrat = JComboBox<String?>()
+    private val opponentOneStrat = JComboBox<ComboBoxItem<IStrategy>>()
+    private val opponentTwoStrat = JComboBox<ComboBoxItem<IStrategy>>()
+    private val opponentThreeStrat = JComboBox<ComboBoxItem<IStrategy>>()
     private val label = JLabel("Note: Changes will not take effect until you start a new game.")
     private val separator_4 = JSeparator()
     private val lblApiHeader = JLabel("API Options")
@@ -89,7 +83,6 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
         opponentThreeNameField.setDocument(LimitedDocument(10))
         opponentOneNameField.setBounds(60, 102, 86, 22)
         add(opponentOneNameField)
-        opponentOneNameField.text = opponentOneName
         opponentOneNameField.setColumns(10)
         cbOpponentTwo.setBounds(22, 143, 29, 23)
         add(cbOpponentTwo)
@@ -97,11 +90,9 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
         add(cbOpponentThree)
         opponentTwoNameField.setBounds(60, 144, 86, 22)
         add(opponentTwoNameField)
-        opponentTwoNameField.text = opponentTwoName
         opponentTwoNameField.setColumns(10)
         opponentThreeNameField.setBounds(60, 186, 86, 22)
         add(opponentThreeNameField)
-        opponentThreeNameField.text = opponentThreeName
         opponentThreeNameField.setColumns(10)
         opponentTwoStrat.setBounds(172, 144, 197, 22)
         add(opponentTwoStrat)
@@ -139,17 +130,19 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
         deleteItem.addActionListener(this)
         amendItem.addActionListener(this)
         tableApiStrategies.addMouseListener(this)
-        cbOpponentTwo.addItemListener(this)
-        cbOpponentThree.addItemListener(this)
+        cbOpponentTwo.addActionListener(this)
+        cbOpponentThree.addActionListener(this)
     }
 
-    /** Abstract methods */
     override fun initVariables() {
         getVariablesFromPrefs()
 
         buildApiTable()
         setPlayerNames()
-        setOpponentEnablementAndStrategies()
+        setOpponentEnablementAndStrategies(
+            getPreference(PreferenceSetting.OpponentTwoEnabled),
+            getPreference(PreferenceSetting.OpponentThreeEnabled),
+        )
         setOpponentStrategies()
     }
 
@@ -168,50 +161,44 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
     }
 
     override fun savePreferences() {
-        playerName = playerNameField.getText()
-        opponentOneName = opponentOneNameField.getText()
-        opponentTwoName = opponentTwoNameField.getText()
-        opponentThreeName = opponentThreeNameField.getText()
-        opponentOneStrategy = opponentOneStrat.selectedItem as String
-        opponentTwoStrategy = opponentTwoStrat.selectedItem as String
-        opponentThreeStrategy = opponentThreeStrat.selectedItem as String
+        val playerName = playerNameField.getText()
+        val opponentOneName = opponentOneNameField.getText()
+        val opponentTwoName = opponentTwoNameField.getText()
+        val opponentThreeName = opponentThreeNameField.getText()
+        val opponentOneStrategy = getSelectedStrategy(opponentOneStrat)
+        val opponentTwoStrategy = getSelectedStrategy(opponentTwoStrat)
+        val opponentThreeStrategy = getSelectedStrategy(opponentThreeStrat)
 
         preferenceStore.save(PreferenceSetting.PlayerName, playerName)
         preferenceStore.save(PreferenceSetting.OpponentOneName, opponentOneName)
         preferenceStore.save(PreferenceSetting.OpponentTwoName, opponentTwoName)
         preferenceStore.save(PreferenceSetting.OpponentThreeName, opponentThreeName)
-        preferenceStore.save(PreferenceSetting.OpponentTwoEnabled, opponentTwoEnabled)
-        preferenceStore.save(PreferenceSetting.OpponentThreeEnabled, opponentThreeEnabled)
-        preferenceStore.save(PreferenceSetting.OpponentOneStrategy, opponentOneStrategy)
-        preferenceStore.save(PreferenceSetting.OpponentTwoStrategy, opponentTwoStrategy)
-        preferenceStore.save(PreferenceSetting.OpponentThreeStrategy, opponentThreeStrategy)
+        preferenceStore.save(PreferenceSetting.OpponentTwoEnabled, cbOpponentTwo.isSelected)
+        preferenceStore.save(PreferenceSetting.OpponentThreeEnabled, cbOpponentThree.isSelected)
 
-        ApiUtil.saveApiStrategiesToPreferences(apiStrategies)
+        saveJsonPreference(PreferenceSetting.OpponentOneStrategy, opponentOneStrategy)
+        saveJsonPreference(PreferenceSetting.OpponentTwoStrategy, opponentTwoStrategy)
+        saveJsonPreference(PreferenceSetting.OpponentThreeStrategy, opponentThreeStrategy)
+        saveApiStrategiesToPreference(apiStrategies)
     }
 
     private fun getVariablesFromPrefs() {
-        playerName = getPreference(PreferenceSetting.PlayerName)
-        opponentOneName = getPreference(PreferenceSetting.OpponentOneName)
-        opponentTwoName = getPreference(PreferenceSetting.OpponentTwoName)
-        opponentThreeName = getPreference(PreferenceSetting.OpponentThreeName)
-        opponentTwoEnabled = getPreference(PreferenceSetting.OpponentTwoEnabled)
-        opponentThreeEnabled = getPreference(PreferenceSetting.OpponentThreeEnabled)
-        opponentOneStrategy = getPreference(PreferenceSetting.OpponentOneStrategy)
-        opponentTwoStrategy = getPreference(PreferenceSetting.OpponentTwoStrategy)
-        opponentThreeStrategy = getPreference(PreferenceSetting.OpponentThreeStrategy)
-        apiStrategies = ApiUtil.getApiStrategiesFromPreferences()
+        apiStrategies = getApiStrategiesFromPreferences()
 
         gameMode = GameMode.valueOf(getPreference(PreferenceSetting.GameMode))
     }
 
     private fun setPlayerNames() {
-        playerNameField.text = playerName
-        opponentOneNameField.text = opponentOneName
-        opponentTwoNameField.text = opponentTwoName
-        opponentThreeNameField.text = opponentThreeName
+        playerNameField.text = getPreference(PreferenceSetting.PlayerName)
+        opponentOneNameField.text = getPreference(PreferenceSetting.OpponentOneName)
+        opponentTwoNameField.text = getPreference(PreferenceSetting.OpponentTwoName)
+        opponentThreeNameField.text = getPreference(PreferenceSetting.OpponentThreeName)
     }
 
-    private fun setOpponentEnablementAndStrategies() {
+    private fun setOpponentEnablementAndStrategies(
+        opponentTwoEnabled: Boolean,
+        opponentThreeEnabled: Boolean,
+    ) {
         cbOpponentThree.setEnabled(opponentTwoEnabled)
         cbOpponentTwo.setEnabled(!opponentThreeEnabled)
 
@@ -224,9 +211,15 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
     }
 
     private fun setOpponentStrategies() {
-        opponentOneStrat.setSelectedItem(opponentOneStrategy)
-        opponentTwoStrat.setSelectedItem(opponentTwoStrategy)
-        opponentThreeStrat.setSelectedItem(opponentThreeStrategy)
+        opponentOneStrat.setSelectedItem(
+            getStrategy(PreferenceSetting.OpponentOneStrategy).toComboBoxItem()
+        )
+        opponentTwoStrat.setSelectedItem(
+            getStrategy(PreferenceSetting.OpponentTwoStrategy).toComboBoxItem()
+        )
+        opponentThreeStrat.setSelectedItem(
+            getStrategy(PreferenceSetting.OpponentThreeStrategy).toComboBoxItem()
+        )
     }
 
     private fun buildApiTable() {
@@ -237,12 +230,11 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
         model.addColumn("Name")
         model.addColumn("Port")
         model.addColumn("Game")
-        model.addColumn("Messaging")
         model.addColumn("Enabled")
 
         // Centre rendering for everything but the last column
         for (i in 0..<model.columnCount - 1) {
-            tableApiStrategies.getColumnModel().getColumn(i).setCellRenderer(SimpleRenderer(null))
+            tableApiStrategies.columnModel.getColumn(i).setCellRenderer(SimpleRenderer(null))
         }
 
         // Sorting
@@ -250,44 +242,58 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
         tableApiStrategies.setRowSorter(sorter)
 
         // Populate the rows
-        apiStrategies.forEach { model.addRow(it.tableModelRow) }
+        apiStrategies.forEach { model.addRow(it.getTableModelRow().toTypedArray()) }
 
         updateStrategySelection(gameMode)
     }
 
+    private fun ApiStrategy.getTableModelRow(): List<Any> {
+        return listOf(name, port, supportedModes.joinToString(), lastError == null)
+    }
+
     fun updateStrategySelection(gameMode: GameMode) {
         this.gameMode = gameMode
 
-        val allStrategies =
-            CpuStrategies.getAllStrategies(gameMode == GameMode.Entropy, apiStrategies)
+        updateStrategySelection(gameMode, opponentOneStrat)
+        updateStrategySelection(gameMode, opponentTwoStrat)
+        updateStrategySelection(gameMode, opponentThreeStrat)
+    }
+
+    private fun updateStrategySelection(
+        gameMode: GameMode,
+        combo: JComboBox<ComboBoxItem<IStrategy>>,
+    ) {
+        val selection = if (combo.selectedIndex == -1) null else getSelectedStrategy(combo)
 
-        var comboModel: ComboBoxModel<String?> = DefaultComboBoxModel(allStrategies)
-        opponentOneStrat.setModel(comboModel)
-        comboModel = DefaultComboBoxModel(allStrategies)
-        opponentTwoStrat.setModel(comboModel)
-        comboModel = DefaultComboBoxModel(allStrategies)
-        opponentThreeStrat.setModel(comboModel)
+        combo.setModel(getStrategiesComboBoxModel(gameMode, apiStrategies))
+        selection?.let { combo.selectedItem = selection.toComboBoxItem() }
     }
 
     private fun enableApi(strategy: ApiStrategy) {
         val question =
-            "Strategy ${strategy.name} was disabled due to the following error:\n\n${strategy.error}\n\nWould you like to re-enable it?"
+            "Strategy ${strategy.name} was disabled due to the following error:\n\n${strategy.lastError}\n\nWould you like to re-enable it?"
 
         val option = DialogUtilNew.showQuestion(question, false)
         if (option == JOptionPane.YES_OPTION) {
-            strategy.error = ""
-            buildApiTable()
+            strategyUpdated(strategy, strategy.copy(lastError = null))
         }
     }
 
-    private fun amendApi(strategy: ApiStrategy?) {
-        ApiAmendDialog.amendStrategy(strategy)
+    private fun amendApi(strategy: ApiStrategy) {
+        val newStrategy = ApiAmendDialog.amendStrategy(strategy) ?: return
+
+        strategyUpdated(strategy, newStrategy)
+    }
+
+    private fun strategyUpdated(oldStrategy: ApiStrategy, newStrategy: ApiStrategy) {
+        apiStrategies = apiStrategies.map { if (it == oldStrategy) newStrategy else it }
+
         buildApiTable()
     }
 
     private fun deleteApi(strategy: ApiStrategy) {
-        val question = "Are you sure you want to delete the " + strategy.getName() + " strategy?"
-        val option = DialogUtilNew.showQuestion(question, false)
+        val question = "Are you sure you want to delete the " + strategy.name + " strategy?"
+        val option = DialogUtilNew.showQuestion(question, false, this)
         if (option == JOptionPane.YES_OPTION) {
             apiStrategies = apiStrategies - strategy
             buildApiTable()
@@ -321,6 +327,8 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
             getSelectedStrategyFromTable()?.let(::deleteApi)
         } else if (source === enableItem) {
             getSelectedStrategyFromTable()?.let(::enableApi)
+        } else if (source == cbOpponentTwo || source == cbOpponentThree) {
+            setOpponentEnablementAndStrategies(cbOpponentTwo.isSelected, cbOpponentThree.isSelected)
         }
     }
 
@@ -338,15 +346,15 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
             }
 
             if (strategy != null) {
-                enableItem.setEnabled(!strategy.isEnabled)
+                enableItem.setEnabled(strategy.lastError != null)
 
                 // Show the popup menu
-                popupMenu.show(arg0.component, arg0.getX(), arg0.getY())
+                popupMenu.show(arg0.component, arg0.x, arg0.y)
             }
-        } else if (arg0.getClickCount() == 2) {
+        } else if (arg0.clickCount == 2) {
             // Double-click
             if (strategy != null) {
-                if (!strategy.isEnabled) {
+                if (strategy.lastError != null) {
                     enableApi(strategy)
                 } else {
                     amendApi(strategy)
@@ -360,15 +368,4 @@ class PreferencesPanelPlayers(parent: PreferencesDialog) :
     override fun mouseEntered(arg0: MouseEvent?) {}
 
     override fun mouseReleased(arg0: MouseEvent?) {}
-
-    override fun itemStateChanged(arg0: ItemEvent) {
-        val source = arg0.getSource()
-        if (source === cbOpponentTwo) {
-            opponentTwoEnabled = cbOpponentTwo.isSelected
-            setOpponentEnablementAndStrategies()
-        } else if (source === cbOpponentThree) {
-            opponentThreeEnabled = cbOpponentThree.isSelected
-            setOpponentEnablementAndStrategies()
-        }
-    }
 }
diff --git a/client/src/main/kotlin/strategy/ApiStrategy.kt b/client/src/main/kotlin/strategy/ApiStrategy.kt
new file mode 100644
index 00000000..4acdae19
--- /dev/null
+++ b/client/src/main/kotlin/strategy/ApiStrategy.kt
@@ -0,0 +1,24 @@
+package strategy
+
+import com.fasterxml.jackson.core.type.TypeReference
+import game.GameMode
+import java.util.UUID
+import utils.CoreGlobals
+
+data class ApiStrategy(
+    override val name: String,
+    val supportedModes: List<GameMode>,
+    val port: Int,
+    val lastError: String? = null,
+    val id: UUID = UUID.randomUUID(),
+) : IStrategy
+
+/**
+ * Can't just write using the vanilla mapper because of type erasure problems :(
+ * https://stackoverflow.com/questions/34193177/why-does-jackson-polymorphic-serialization-not-work-in-lists
+ */
+fun List<ApiStrategy>.toJsonString(): String {
+    val writer = CoreGlobals.jsonMapper.writerFor(object : TypeReference<List<ApiStrategy>>() {})
+
+    return writer.writeValueAsString(this)
+}
diff --git a/client/src/main/kotlin/strategy/IStrategy.kt b/client/src/main/kotlin/strategy/IStrategy.kt
new file mode 100644
index 00000000..0c144ead
--- /dev/null
+++ b/client/src/main/kotlin/strategy/IStrategy.kt
@@ -0,0 +1,20 @@
+package strategy
+
+import bean.ComboBoxItem
+import com.fasterxml.jackson.annotation.JsonSubTypes
+import com.fasterxml.jackson.annotation.JsonTypeInfo
+
+@JsonTypeInfo(
+    use = JsonTypeInfo.Id.NAME,
+    include = JsonTypeInfo.As.PROPERTY,
+    property = "strategyType",
+)
+@JsonSubTypes(
+    JsonSubTypes.Type(value = InBuiltStrategy::class, name = "IN_BUILT"),
+    JsonSubTypes.Type(value = ApiStrategy::class, name = "API"),
+)
+interface IStrategy {
+    val name: String
+}
+
+fun IStrategy.toComboBoxItem() = ComboBoxItem(this, this.name, true)
diff --git a/client/src/main/kotlin/strategy/InBuiltStrategy.kt b/client/src/main/kotlin/strategy/InBuiltStrategy.kt
new file mode 100644
index 00000000..3349c627
--- /dev/null
+++ b/client/src/main/kotlin/strategy/InBuiltStrategy.kt
@@ -0,0 +1,3 @@
+package strategy
+
+data class InBuiltStrategy(override val name: String) : IStrategy
diff --git a/client/src/main/kotlin/util/StrategyParams.kt b/client/src/main/kotlin/strategy/StrategyParams.kt
similarity index 93%
rename from client/src/main/kotlin/util/StrategyParams.kt
rename to client/src/main/kotlin/strategy/StrategyParams.kt
index 1a2a0806..e4442ced 100644
--- a/client/src/main/kotlin/util/StrategyParams.kt
+++ b/client/src/main/kotlin/strategy/StrategyParams.kt
@@ -1,4 +1,4 @@
-package util
+package strategy
 
 import game.BidAction
 import game.GameSettings
diff --git a/client/src/main/kotlin/game/StrategyUtil.kt b/client/src/main/kotlin/strategy/StrategyUtil.kt
similarity index 59%
rename from client/src/main/kotlin/game/StrategyUtil.kt
rename to client/src/main/kotlin/strategy/StrategyUtil.kt
index f081e3bd..f4e31de1 100644
--- a/client/src/main/kotlin/game/StrategyUtil.kt
+++ b/client/src/main/kotlin/strategy/StrategyUtil.kt
@@ -1,10 +1,97 @@
-package game
-
+package strategy
+
+import bean.ComboBoxItem
+import game.GameMode
+import game.GameSettings
+import game.Suit
+import game.VectropyBidAction
+import game.countContribution
+import game.countSuit
+import game.createAndShuffleDeck
+import java.util.UUID
+import javax.swing.ComboBoxModel
+import javax.swing.DefaultComboBoxModel
+import javax.swing.JComboBox
 import kotlin.math.ceil
 import kotlin.math.floor
-import strategy.DefaultRandom
-import strategy.IRandom
-import util.StrategyParams
+import preference.PreferenceSetting
+import preference.findJsonPreference
+import preference.getPreference
+import settings.Setting
+import util.ClientGlobals.preferenceStore
+import util.CpuStrategies
+import util.EntCpuStrategies
+import util.VectCpuStrategies
+import utils.CoreGlobals.logger
+
+fun getAllStrategies(gameType: GameMode, apiStrategies: List<ApiStrategy>): List<IStrategy> {
+    val inBuilt =
+        if (gameType == GameMode.Entropy) EntCpuStrategies.getAllStrategies()
+        else VectCpuStrategies.getAllStrategies()
+
+    return inBuilt.map(::InBuiltStrategy) + apiStrategies
+}
+
+@JvmOverloads
+fun getStrategiesComboBoxModel(
+    gameMode: GameMode,
+    apiStrategies: List<ApiStrategy> = getApiStrategiesFromPreferences(),
+): ComboBoxModel<ComboBoxItem<IStrategy>> {
+    val strategyArray =
+        getAllStrategies(gameMode, apiStrategies)
+            .map { strategy -> strategy.toComboBoxItem() }
+            .toTypedArray()
+
+    return DefaultComboBoxModel(strategyArray)
+}
+
+fun getSelectedStrategy(comboBox: JComboBox<ComboBoxItem<IStrategy>>): IStrategy {
+    val item = comboBox.getItemAt(comboBox.selectedIndex)
+
+    return item.hiddenData
+}
+
+fun getApiStrategiesFromPreferences() =
+    findJsonPreference<List<ApiStrategy>>(PreferenceSetting.ApiStrategies) ?: emptyList()
+
+fun getStrategy(setting: Setting<String>): IStrategy =
+    try {
+        findJsonPreference<IStrategy>(setting) ?: InBuiltStrategy(CpuStrategies.STRATEGY_BASIC)
+    } catch (e: Exception) {
+        logger.info(
+            "strategy.parseError",
+            "Caught $e trying to parse saved strategy. Raw value [${getPreference(setting)}], will revert to Basic.",
+        )
+        InBuiltStrategy(CpuStrategies.STRATEGY_BASIC)
+    }
+
+fun saveApiStrategiesToPreference(strategies: List<ApiStrategy>) {
+    preferenceStore.save(PreferenceSetting.ApiStrategies, strategies.toJsonString())
+}
+
+fun saveStrategyErrorAndUnsetStrategies(id: UUID, error: String?) {
+    // Something has gone wrong, so save the API strategy as disabled
+    val strategies = getApiStrategiesFromPreferences()
+    val strategy = strategies.first { it.id == id }.copy(lastError = error)
+    val updated = strategies.update(id, strategy)
+
+    saveApiStrategiesToPreference(updated)
+
+    resetCpuStrategy(PreferenceSetting.OpponentOneStrategy, id)
+    resetCpuStrategy(PreferenceSetting.OpponentTwoStrategy, id)
+    resetCpuStrategy(PreferenceSetting.OpponentThreeStrategy, id)
+}
+
+private fun resetCpuStrategy(strategySetting: Setting<String>, id: UUID) {
+    val strategy = getPreference(strategySetting)
+    if (strategy.contains(id.toString())) {
+        preferenceStore.save(strategySetting, CpuStrategies.STRATEGY_BASIC)
+    }
+}
+
+fun List<ApiStrategy>.update(id: UUID, newStrategy: ApiStrategy) = map {
+    if (it.id == id) newStrategy else it
+}
 
 fun getEvMap(
     visibleCards: List<String>,
diff --git a/client/src/main/kotlin/util/GameSimulator.kt b/client/src/main/kotlin/util/GameSimulator.kt
index 4b2c6108..f206f264 100644
--- a/client/src/main/kotlin/util/GameSimulator.kt
+++ b/client/src/main/kotlin/util/GameSimulator.kt
@@ -7,6 +7,7 @@ import game.createAndShuffleDeck
 import `object`.Player
 import screen.ScreenCache.get
 import screen.SimulationDialog
+import strategy.StrategyParams
 import utils.CoreGlobals.logger
 
 class GameSimulator(private val params: SimulationParams) {
diff --git a/client/src/main/kotlin/util/SimulationParams.kt b/client/src/main/kotlin/util/SimulationParams.kt
index a48174a6..e655915b 100644
--- a/client/src/main/kotlin/util/SimulationParams.kt
+++ b/client/src/main/kotlin/util/SimulationParams.kt
@@ -1,15 +1,16 @@
 package util
 
 import game.GameSettings
+import strategy.IStrategy
 
 data class SimulationParams(
     val settings: GameSettings,
     val opponentTwoEnabled: Boolean,
     val opponentThreeEnabled: Boolean,
-    val opponentZeroStrategy: String,
-    val opponentOneStrategy: String,
-    val opponentTwoStrategy: String,
-    val opponentThreeStrategy: String,
+    val opponentZeroStrategy: IStrategy,
+    val opponentOneStrategy: IStrategy,
+    val opponentTwoStrategy: IStrategy,
+    val opponentThreeStrategy: IStrategy,
     val enableLogging: Boolean,
     val randomiseOrder: Boolean,
     val forceStart: Boolean,
diff --git a/client/src/main/kotlin/util/SimulationResults.kt b/client/src/main/kotlin/util/SimulationResults.kt
index 8aa56023..6429fd53 100644
--- a/client/src/main/kotlin/util/SimulationResults.kt
+++ b/client/src/main/kotlin/util/SimulationResults.kt
@@ -1,6 +1,7 @@
 package util
 
 import java.util.Vector
+import strategy.IStrategy
 
 class SimulationResults {
     private var wins = 0.0
@@ -45,10 +46,10 @@ class SimulationResults {
         return MathsUtil.getPercentage(numerator, denominator, 2)
     }
 
-    fun generateRow(opponentNumber: Int, strategy: String, totalGames: Int): Vector<String> {
+    fun generateRow(opponentNumber: Int, strategy: IStrategy, totalGames: Int): Vector<String> {
         val row = Vector<String>()
         row.add("" + opponentNumber)
-        row.add(strategy)
+        row.add(strategy.name)
         row.add("" + getWinRate(totalGames))
         row.add("" + getChallengeRate())
         row.add("" + getChallengeSuccessRate())
diff --git a/client/src/test/kotlin/TestUtils.kt b/client/src/test/kotlin/TestUtils.kt
index 4b58842f..697ceced 100644
--- a/client/src/test/kotlin/TestUtils.kt
+++ b/client/src/test/kotlin/TestUtils.kt
@@ -19,10 +19,12 @@ import kong.unirest.HttpMethod
 import kong.unirest.HttpStatus
 import online.screen.OnlineChatPanel
 import strategy.IRandom
+import strategy.IStrategy
+import strategy.InBuiltStrategy
+import strategy.StrategyParams
 import testCore.makeGameSettings
 import util.CpuStrategies
 import util.SimulationParams
-import util.StrategyParams
 
 fun getInfoDialog() = getOptionPaneDialog("Information")
 
@@ -72,10 +74,10 @@ fun makeSimulationParams(
     settings: GameSettings = makeGameSettings(),
     opponentTwoEnabled: Boolean = true,
     opponentThreeEnabled: Boolean = true,
-    opponentZeroStrategy: String = CpuStrategies.STRATEGY_BASIC,
-    opponentOneStrategy: String = CpuStrategies.STRATEGY_BASIC,
-    opponentTwoStrategy: String = CpuStrategies.STRATEGY_BASIC,
-    opponentThreeStrategy: String = CpuStrategies.STRATEGY_BASIC,
+    opponentZeroStrategy: IStrategy = InBuiltStrategy(CpuStrategies.STRATEGY_BASIC),
+    opponentOneStrategy: IStrategy = InBuiltStrategy(CpuStrategies.STRATEGY_BASIC),
+    opponentTwoStrategy: IStrategy = InBuiltStrategy(CpuStrategies.STRATEGY_BASIC),
+    opponentThreeStrategy: IStrategy = InBuiltStrategy(CpuStrategies.STRATEGY_BASIC),
     enableLogging: Boolean = false,
     randomiseOrder: Boolean = false,
     forceStart: Boolean = false,
diff --git a/client/src/test/kotlin/strategy/ApiStrategyTest.kt b/client/src/test/kotlin/strategy/ApiStrategyTest.kt
new file mode 100644
index 00000000..fe8e55e9
--- /dev/null
+++ b/client/src/test/kotlin/strategy/ApiStrategyTest.kt
@@ -0,0 +1,32 @@
+package strategy
+
+import com.fasterxml.jackson.module.kotlin.readValue
+import game.GameMode
+import io.kotest.matchers.shouldBe
+import org.junit.jupiter.api.Test
+import util.AbstractClientTest
+import utils.CoreGlobals
+
+class ApiStrategyTest : AbstractClientTest() {
+    @Test
+    fun `Should serialise and deserialise correctly`() {
+        val action: IStrategy = ApiStrategy("Alyssa", listOf(GameMode.Entropy), 400)
+        val json = CoreGlobals.jsonMapper.writeValueAsString(action)
+        val deserialized = CoreGlobals.jsonMapper.readValue(json, IStrategy::class.java)
+        deserialized shouldBe action
+    }
+
+    @Test
+    fun `Should serialise and deserialise a list of ApiStrategies`() {
+        val strats =
+            listOf(
+                ApiStrategy("Strategy One", listOf(GameMode.Entropy), 8080),
+                ApiStrategy("Strategy Two", listOf(GameMode.Entropy, GameMode.Vectropy), 9090),
+            )
+
+        val json = strats.toJsonString()
+
+        val deserialized = CoreGlobals.jsonMapper.readValue<List<IStrategy>>(json)
+        deserialized shouldBe strats
+    }
+}
diff --git a/client/src/test/kotlin/game/StrategyUtilTest.kt b/client/src/test/kotlin/strategy/StrategyUtilTest.kt
similarity index 95%
rename from client/src/test/kotlin/game/StrategyUtilTest.kt
rename to client/src/test/kotlin/strategy/StrategyUtilTest.kt
index f90023ab..01cbcdb2 100644
--- a/client/src/test/kotlin/game/StrategyUtilTest.kt
+++ b/client/src/test/kotlin/strategy/StrategyUtilTest.kt
@@ -1,11 +1,12 @@
-package game
+package strategy
 
 import TestRandom
+import game.Suit
+import game.VectropyBidAction
 import io.kotest.matchers.doubles.shouldBeBetween
 import io.kotest.matchers.maps.shouldContainAll
 import io.kotest.matchers.maps.shouldNotContainKeys
 import io.kotest.matchers.shouldBe
-import kotlin.collections.plus
 import makeStrategyParams
 import org.junit.jupiter.api.Test
 import testCore.makeGameSettings
@@ -106,7 +107,7 @@ class StrategyUtilTest : AbstractClientTest() {
         val openingOne = getBasicVectropyOpening("Clive", emptyList(), strategyParams, random)
         val openingTwo = getBasicVectropyOpening("Clive", emptyList(), strategyParams, random)
 
-        val emptyBid = Suit.filter(strategyParams.settings).associateWith { 0 }
+        val emptyBid = Suit.Companion.filter(strategyParams.settings).associateWith { 0 }
 
         openingOne shouldBe VectropyBidAction("Clive", false, emptyBid + (Suit.Clubs to 1))
         openingTwo shouldBe VectropyBidAction("Clive", false, emptyBid + (Suit.Diamonds to 1))
@@ -139,7 +140,7 @@ class StrategyUtilTest : AbstractClientTest() {
         val hand = listOf("4d")
         val opening = getBasicVectropyOpening("Clive", hand, strategyParams, random)
 
-        val emptyBid = Suit.filter(strategyParams.settings).associateWith { 0 }
+        val emptyBid = Suit.Companion.filter(strategyParams.settings).associateWith { 0 }
         opening shouldBe VectropyBidAction("Clive", false, emptyBid + (Suit.Diamonds to 1))
     }
 
@@ -180,7 +181,7 @@ class StrategyUtilTest : AbstractClientTest() {
                 getEvVectropyOpening("Robert", listOf("3h"), strategyParams, random)
             }
 
-        val emptyBid = Suit.filter(strategyParams.settings).associateWith { 0 }
+        val emptyBid = Suit.Companion.filter(strategyParams.settings).associateWith { 0 }
         val randomSuit = VectropyBidAction("Robert", false, emptyBid + (Suit.Clubs to 1))
         val strongestSuit = VectropyBidAction("Robert", false, emptyBid + (Suit.Hearts to 1))
 
diff --git a/client/src/test/kotlin/util/GameSimulatorBenchmarkTest.kt b/client/src/test/kotlin/util/GameSimulatorBenchmarkTest.kt
index bb526861..c14598ca 100644
--- a/client/src/test/kotlin/util/GameSimulatorBenchmarkTest.kt
+++ b/client/src/test/kotlin/util/GameSimulatorBenchmarkTest.kt
@@ -6,6 +6,7 @@ import makeSimulationParams
 import org.junit.jupiter.api.Test
 import screen.ScreenCache.get
 import screen.SimulationDialog
+import strategy.InBuiltStrategy
 import testCore.makeGameSettings
 
 class GameSimulatorBenchmarkTest : AbstractClientTest() {
@@ -17,8 +18,8 @@ class GameSimulatorBenchmarkTest : AbstractClientTest() {
                 settings,
                 opponentTwoEnabled = false,
                 opponentThreeEnabled = false,
-                opponentZeroStrategy = CpuStrategies.STRATEGY_BASIC,
-                opponentOneStrategy = CpuStrategies.STRATEGY_EV,
+                opponentZeroStrategy = InBuiltStrategy(CpuStrategies.STRATEGY_BASIC),
+                opponentOneStrategy = InBuiltStrategy(CpuStrategies.STRATEGY_EV),
                 randomiseOrder = true,
             )
 
@@ -41,8 +42,8 @@ class GameSimulatorBenchmarkTest : AbstractClientTest() {
                 settings,
                 opponentTwoEnabled = false,
                 opponentThreeEnabled = false,
-                opponentZeroStrategy = CpuStrategies.STRATEGY_BASIC,
-                opponentOneStrategy = CpuStrategies.STRATEGY_EV,
+                opponentZeroStrategy = InBuiltStrategy(CpuStrategies.STRATEGY_BASIC),
+                opponentOneStrategy = InBuiltStrategy(CpuStrategies.STRATEGY_EV),
                 randomiseOrder = true,
             )
 
diff --git a/client/src/test/kotlin/util/SimulationResultsTest.kt b/client/src/test/kotlin/util/SimulationResultsTest.kt
index e3938698..0d144672 100644
--- a/client/src/test/kotlin/util/SimulationResultsTest.kt
+++ b/client/src/test/kotlin/util/SimulationResultsTest.kt
@@ -3,6 +3,7 @@ package util
 import io.kotest.matchers.collections.shouldContainExactly
 import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.Test
+import strategy.InBuiltStrategy
 
 class SimulationResultsTest : AbstractClientTest() {
     @Test
@@ -57,7 +58,7 @@ class SimulationResultsTest : AbstractClientTest() {
         repeat(1011) { results.incrementTotalChallenges() }
         repeat(685) { results.incrementGoodChallenges() }
 
-        val row = results.generateRow(0, CpuStrategies.STRATEGY_BASIC, 10000)
+        val row = results.generateRow(0, InBuiltStrategy(CpuStrategies.STRATEGY_BASIC), 10000)
         row.shouldContainExactly(
             "0",
             CpuStrategies.STRATEGY_BASIC,
diff --git a/core/src/main/java/util/Registry.java b/core/src/main/java/util/Registry.java
index 6f82d7de..0ed74a43 100644
--- a/core/src/main/java/util/Registry.java
+++ b/core/src/main/java/util/Registry.java
@@ -80,9 +80,6 @@ public interface Registry
 	//savedGame
 	public static final String SAVED_GAME_STRING_RESULT_TEXT = "resultText";
 	public static final String SAVED_GAME_STRING_TOTAL_CARDS_LABEL = "totalCardsLabel";
-	public static final String SAVED_GAME_STRING_OPPONENT_THREE_STRATEGY = "opponentThreeStrategy";
-	public static final String SAVED_GAME_STRING_OPPONENT_TWO_STRATEGY = "opponentTwoStrategy";
-	public static final String SAVED_GAME_STRING_OPPONENT_ONE_STRATEGY = "opponentOneStrategy";
 	public static final String SAVED_GAME_STRING_OPPONENT_THREE_HAND = "opponentThreeHand";
 	public static final String SAVED_GAME_STRING_OPPONENT_TWO_HAND = "opponentTwoHand";
 	public static final String SAVED_GAME_STRING_OPPONENT_ONE_HAND = "opponentOneHand";
diff --git a/go-bot/main.py b/go-bot/main.py
new file mode 100644
index 00000000..0657a56f
--- /dev/null
+++ b/go-bot/main.py
@@ -0,0 +1,26 @@
+import json
+import socket
+
+def accept_message(s):
+    conn, addr = s.accept()
+    try:
+        data = conn.recv(1024)
+        if not data:
+            return
+        handle_message(data, conn)
+    finally:
+        conn.close()
+
+
+def handle_message(raw: str, conn):
+    print("received:", raw)
+    obj = json.loads(raw)
+
+
+if __name__ == '__main__':
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s.bind(('localhost', 4048))
+    s.listen(1)
+
+    while True:
+        accept_message(s)