Index: /bidspace/pom.xml
===================================================================
--- /bidspace/pom.xml	(revision 8)
+++ /bidspace/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>bidspace</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -15,5 +15,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -36,5 +36,5 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>profile</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 
Index: /events/pom.xml
===================================================================
--- /events/pom.xml	(revision 8)
+++ /events/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>events</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -43,10 +43,10 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>issuevalue</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>geniusweb</groupId>
 			<artifactId>references</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 
Index: /exampleparties/boulware/pom.xml
===================================================================
--- /exampleparties/boulware/pom.xml	(revision 8)
+++ /exampleparties/boulware/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>boulware</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -33,5 +33,5 @@
 			<groupId>geniusweb.exampleparties</groupId>
 			<artifactId>timedependentparty</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
Index: /exampleparties/conceder/pom.xml
===================================================================
--- /exampleparties/conceder/pom.xml	(revision 8)
+++ /exampleparties/conceder/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>conceder</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -33,5 +33,5 @@
 			<groupId>geniusweb.exampleparties</groupId>
 			<artifactId>timedependentparty</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
Index: /exampleparties/hardliner/pom.xml
===================================================================
--- /exampleparties/hardliner/pom.xml	(revision 8)
+++ /exampleparties/hardliner/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>hardliner</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -33,5 +33,5 @@
 			<groupId>geniusweb.exampleparties</groupId>
 			<artifactId>timedependentparty</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
Index: /exampleparties/humangui/pom.xml
===================================================================
--- /exampleparties/humangui/pom.xml	(revision 9)
+++ /exampleparties/humangui/pom.xml	(revision 9)
@@ -0,0 +1,288 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>geniusweb.exampleparties</groupId>
+	<artifactId>humangui</artifactId>
+	<version>1.1.0</version>
+	<packaging>jar</packaging>
+
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<basedir>.</basedir>
+		<passwd>${env.ARTIFACTORY_PASS}</passwd>
+		<jackson-2-version>2.9.6</jackson-2-version>
+	</properties>
+
+	<distributionManagement>
+		<repository>
+			<id>artifactory.ewi.tudelft.nl</id>
+			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+		</repository>
+	</distributionManagement>
+
+
+	<dependencies>
+
+
+		<dependency>
+			<groupId>geniusweb</groupId>
+			<artifactId>party</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>geniusweb</groupId>
+			<artifactId>bidspace</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>tudelft.utilities</groupId>
+			<artifactId>logging</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>geniusweb</groupId>
+			<artifactId>profileconnection</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>tudelft.utilities</groupId>
+			<artifactId>immutablelist</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+
+		<!-- the core, which includes Streaming API, shared low-level abstractions 
+			(but NOT data-binding) -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson-2-version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Just the annotations; use this dependency if you want to attach annotations 
+			to classes without connecting them to the code. -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson-2-version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson-2-version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- smile (binary JSON). Other artifacts in this group do other formats. -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-smile</artifactId>
+			<version>${jackson-2-version}</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- JAX-RS provider -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>${jackson-2-version}</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- Support for JAX-B annotations as additional configuration -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>${jackson-2-version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.9.5</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>tudelft.utilities</groupId>
+			<artifactId>junit</artifactId>
+			<version>1.0.1</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+
+	<repositories>
+		<repository>
+			<id>artifactory.ewi.tudelft.nl</id>
+			<url>http://artifactory.ewi.tudelft.nl/artifactory/libs-release</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>jcenter</id>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+
+	<build>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.0</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>geniusweb.exampleparties.humangui.HumanGui</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.1</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>${javadoc.opts}</additionalparam>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.jfrog.buildinfo</groupId>
+				<artifactId>artifactory-maven-plugin</artifactId>
+				<version>2.6.1</version>
+				<executions>
+					<execution>
+						<id>build-info</id>
+						<goals>
+							<goal>publish</goal>
+						</goals>
+						<configuration>
+							<publisher>
+								<contextUrl>http://artifactory.ewi.tudelft.nl/artifactory</contextUrl>
+								<repoKey>libs-release</repoKey>
+								<username>wouter</username>
+								<password>${passwd}</password>
+							</publisher>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.4.1</version>
+				<configuration>
+					<!-- get all project dependencies -->
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+							<mainClass>geniusweb.exampleparties.humangui.HumanGui</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<!-- bind to the packaging phase -->
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+
+		</plugins>
+
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.jfrog.buildinfo</groupId>
+										<artifactId>artifactory-maven-plugin</artifactId>
+										<versionRange>[1.0.0,)</versionRange>
+										<goals>
+											<goal>publish</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+
+
+	</build>
+</project>
Index: /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/BiddingInfo.java
===================================================================
--- /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/BiddingInfo.java	(revision 9)
+++ /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/BiddingInfo.java	(revision 9)
@@ -0,0 +1,168 @@
+package geniusweb.exampleparties.humangui;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.logging.Level;
+
+import javax.websocket.DeploymentException;
+
+import geniusweb.actions.Action;
+import geniusweb.actions.Offer;
+import geniusweb.actions.PartyId;
+import geniusweb.connection.ConnectionEnd;
+import geniusweb.issuevalue.Bid;
+import geniusweb.party.inform.Inform;
+import geniusweb.party.inform.Settings;
+import geniusweb.profile.Profile;
+import geniusweb.profileconnection.ProfileInterface;
+import geniusweb.progress.Progress;
+import geniusweb.progress.ProgressRounds;
+import tudelft.utilities.listener.DefaultListenable;
+import tudelft.utilities.logging.Reporter;
+
+/**
+ * Contains the current state of the user's negotiation. mutable. Assumes SAOP
+ * protocol.
+ * <p>
+ * Listeners receive the following objects:
+ * <ul>
+ * <li>{@link Action} if user did an action (place offer, end nego, etc)
+ * <li>{@link Bid} if user changed his prepared bid (but did not yet offer it)
+ * <li>{@link Profile} if the profile was changed
+ * <li>{@Link Boolean} if the isMyTurn value changed.
+ * </ul>
+ */
+public class BiddingInfo extends DefaultListenable<Object> {
+	private final PartyId me;
+	private Offer lastReceivedOffer = null;
+	private Progress progress = null;
+	private Reporter reporter;
+
+	// profile is the latest one received.
+	private Profile profile = null;
+
+	// same as profile.getDomain but forces order on the issues
+	// unmodifyable (but we can replace the whole list)
+	private List<String> issues = Collections.emptyList();
+	private Bid currentBid = new Bid(Collections.emptyMap());
+	private boolean isMyTurn = false;
+	private ConnectionEnd<Inform, Action> connection;
+
+	/**
+	 * 
+	 * @param settings   the session {@link Settings}
+	 * @param connection the connection to the protocol.
+	 * @param reporter   the {@link Reporter} where we can log issues.
+	 * @param profileint the {@link ProfileInterface}
+	 * @throws Exception if we can not reach the protocol server
+	 */
+	public BiddingInfo(Settings settings,
+			ConnectionEnd<Inform, Action> connection, Reporter reporter,
+			ProfileInterface profileint)
+			throws IOException, DeploymentException {
+		this.connection = connection;
+		this.me = settings.getID();
+		this.progress = settings.getProgress();
+		this.reporter = reporter;
+
+		profileint.addListener(prof -> updateProfile(prof));
+		// this call blocks till we have the profile.
+		updateProfile(profileint.getProfile());
+	}
+
+	/**
+	 * 
+	 * @return the profile currently used.
+	 */
+	public Profile getProfile() {
+		return profile;
+	}
+
+	/**
+	 * Changes the model to use the given new profile.
+	 * 
+	 * @param newprof a new profile
+	 */
+	private void updateProfile(Profile newprof) {
+		this.profile = newprof;
+		this.issues = Collections.unmodifiableList(
+				new LinkedList<String>(newprof.getDomain().getIssues()));
+		notifyListeners(newprof);
+	}
+
+	/**
+	 * executes an action and sets isMyTurn to false.
+	 * 
+	 * @param action the action to execute.
+	 * @throws IOException           if action can not be sent.
+	 * @throws IllegalStateException if isMyTurn is false.
+	 */
+	public void doAction(Action action) {
+		if (!isMyTurn) {
+			reporter.log(Level.SEVERE, "User did action but it's not his turn");
+			return;
+		}
+		try {
+			connection.send(action);
+		} catch (IOException e) {
+			reporter.log(Level.SEVERE, "Can't send action", e);
+			return;
+		}
+		if (progress instanceof ProgressRounds) {
+			progress = ((ProgressRounds) progress).advance();
+		}
+		setMyTurn(false);
+		// notifyListeners(action);
+	}
+
+	/**
+	 * @param offer offer received from some other party
+	 */
+	public void receivedOffer(Offer offer) {
+		lastReceivedOffer = offer;
+		notifyListeners(offer);
+	}
+
+	/**
+	 * 
+	 * @return the last received offer, or null if no offer received yet.
+	 */
+	public Offer getReceivedOffer() {
+		return lastReceivedOffer;
+	}
+
+	public List<String> getIssues() {
+		return issues;
+	}
+
+	/**
+	 * 
+	 * @return current bid. Initially is an empty bid.
+	 */
+	public Bid getCurrentBid() {
+		return currentBid;
+	}
+
+	public void setCurrentBid(Bid bid) {
+		if (bid == null)
+			throw new IllegalArgumentException();
+		if (!bid.equals(currentBid)) {
+			currentBid = bid;
+			notifyListeners(bid);
+		}
+	}
+
+	public PartyId getMyId() {
+		return me;
+	}
+
+	public void setMyTurn(boolean b) {
+		if (isMyTurn != b) {
+			isMyTurn = b;
+			notifyListeners(b);
+		}
+	}
+
+}
Index: /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/BiddingTableModel.java
===================================================================
--- /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/BiddingTableModel.java	(revision 9)
+++ /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/BiddingTableModel.java	(revision 9)
@@ -0,0 +1,130 @@
+package geniusweb.exampleparties.humangui;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.TableModel;
+
+import geniusweb.actions.Offer;
+import geniusweb.issuevalue.Bid;
+import geniusweb.issuevalue.Value;
+
+/**
+ * An adapter that moulds the BiddingInfo into a {@link TableModel}. Makes a
+ * 3-col table: left column the issues, middle col the last received offer, and
+ * right col the offer the user is preparing. The right column can be edited.
+ */
+public class BiddingTableModel implements TableModel {
+	private final static String[] cols = { "Issue", "Last received offer",
+			"Your next offer" };
+	private BiddingInfo info;
+	private final List<TableModelListener> listeners = new LinkedList<>();
+
+	public BiddingTableModel(BiddingInfo info) {
+		this.info = info;
+		info.addListener(data -> update(data));
+	}
+
+	@Override
+	public int getRowCount() {
+		return info.getIssues().size();
+	}
+
+	@Override
+	public int getColumnCount() {
+		return cols.length;
+	}
+
+	@Override
+	public String getColumnName(int columnIndex) {
+		return cols[columnIndex];
+	}
+
+	@Override
+	public Class<?> getColumnClass(int columnIndex) {
+		switch (columnIndex) {
+		case 0:
+			return String.class;
+		case 1:
+		case 2:
+			return Value.class;
+		}
+		return null;
+	}
+
+	@Override
+	public boolean isCellEditable(int rowIndex, int columnIndex) {
+		return columnIndex == 2;
+	}
+
+	@Override
+	public Object getValueAt(int rowIndex, int columnIndex) {
+		String issue = getIssue(rowIndex);
+		if (issue == null)
+			return "";
+		switch (columnIndex) {
+		case 0:
+			return issue;
+		case 1:
+			if (info.getReceivedOffer() == null)
+				return null;
+			return info.getReceivedOffer().getBid().getValue(issue);
+		case 2:
+			return info.getCurrentBid().getValue(issue);
+		}
+		return null;
+	}
+
+	@Override
+	public void setValueAt(Object val, int rowIndex, int columnIndex) {
+		if (!(val instanceof Value))
+			throw new IllegalArgumentException("New val must be a value");
+		String issue = getIssue(rowIndex);
+		if (issue == null)
+			return;
+
+		Map<String, Value> newvalues = new HashMap<>();
+		newvalues.putAll(info.getCurrentBid().getIssueValues());
+		newvalues.put(issue, (Value) val);
+		info.setCurrentBid(new Bid(newvalues));
+	}
+
+	@Override
+	public void addTableModelListener(TableModelListener l) {
+		listeners.add(l);
+	}
+
+	@Override
+	public void removeTableModelListener(TableModelListener l) {
+		listeners.remove(l);
+	}
+
+	/************************ PRIVATE ************************/
+	private void update(Object data) {
+		if (data instanceof Offer) {
+			notifyTableListeners();
+		}
+	}
+
+	/**
+	 * @param rowIndex
+	 * @return Get issue associated with given row, or null if no such row.
+	 */
+	private String getIssue(int rowIndex) {
+		if (rowIndex < 0 || rowIndex >= info.getIssues().size())
+			return null;
+		return info.getIssues().get(rowIndex);
+
+	}
+
+	private void notifyTableListeners() {
+		for (TableModelListener l : listeners) {
+			l.tableChanged(new TableModelEvent(this));
+		}
+	}
+
+}
Index: /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/HumanGui.java
===================================================================
--- /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/HumanGui.java	(revision 9)
+++ /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/HumanGui.java	(revision 9)
@@ -0,0 +1,102 @@
+package geniusweb.exampleparties.humangui;
+
+import java.awt.BorderLayout;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.logging.Level;
+
+import javax.swing.JFrame;
+import javax.swing.WindowConstants;
+
+import geniusweb.actions.Action;
+import geniusweb.actions.Offer;
+import geniusweb.party.Capabilities;
+import geniusweb.party.DefaultParty;
+import geniusweb.party.Party;
+import geniusweb.party.inform.ActionDone;
+import geniusweb.party.inform.Finished;
+import geniusweb.party.inform.Inform;
+import geniusweb.party.inform.Settings;
+import geniusweb.party.inform.YourTurn;
+import geniusweb.profileconnection.ProfileConnectionFactory;
+import geniusweb.profileconnection.ProfileInterface;
+import geniusweb.references.ProtocolRef;
+import tudelft.utilities.logging.Reporter;
+
+/**
+ * A {@link Party} that shows a GUI to the user showing the last received offer
+ * and allowing the user to enter his own bid, make an offer or accept the
+ * received offer. The GUI is shown on the window attached to the machine where
+ * the party runs, so this usually will be on the partyserver. Therefore the
+ * users usually will install a partyserver on their local machine to use this
+ * party.
+ */
+public class HumanGui extends DefaultParty {
+
+	private JFrame frame;
+	private BiddingInfo biddinginfo;
+
+	public HumanGui() {
+	}
+
+	public HumanGui(Reporter reporter) {
+		super(reporter); // for debugging
+	}
+
+	@Override
+	public void notifyChange(Inform info) {
+		try {
+			if (info instanceof Settings) {
+				Settings settings = (Settings) info;
+				ProfileInterface profileint = ProfileConnectionFactory
+						.create(settings.getProfile().getURI(), reporter);
+				biddinginfo = new BiddingInfo(settings, getConnection(),
+						getReporter(), profileint);
+				initGUI();
+			} else if (info instanceof ActionDone) {
+				Action otheract = ((ActionDone) info).getAction();
+				if (otheract instanceof Offer) {
+					biddinginfo.receivedOffer((Offer) otheract);
+				}
+			} else if (info instanceof YourTurn) {
+				biddinginfo.setMyTurn(true);
+			} else if (info instanceof Finished) {
+				getReporter().log(Level.INFO, "Final ourcome:" + info);
+				if (frame != null)
+					frame.setVisible(false);
+			}
+		} catch (Exception e) {
+			throw new RuntimeException("Failed to handle info", e);
+		}
+	}
+
+	private void initGUI() {
+		frame = new JFrame("Negotiation for " + biddinginfo.getMyId());
+		frame.getContentPane().setLayout(new BorderLayout());
+		frame.add(new MyGUI(biddinginfo), BorderLayout.CENTER);
+		frame.pack();
+		// we could do frame.addWindowListener but that's a lot of code..
+		frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+		frame.setVisible(true);
+	}
+
+	@Override
+	public Capabilities getCapabilities() {
+		try {
+			return new Capabilities(new HashSet<>(
+					Arrays.asList(new ProtocolRef(new URI("SAOP")))));
+		} catch (URISyntaxException e) {
+			getReporter().log(Level.SEVERE, "Failed to create capabilities URI",
+					e);
+			return null;
+		}
+	}
+
+	@Override
+	public String getDescription() {
+		return "Offers a GUI to the human owning the partiesserver to manually make offers";
+	}
+
+}
Index: /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/MyGUI.java
===================================================================
--- /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/MyGUI.java	(revision 9)
+++ /exampleparties/humangui/src/main/java/geniusweb/exampleparties/humangui/MyGUI.java	(revision 9)
@@ -0,0 +1,107 @@
+package geniusweb.exampleparties.humangui;
+
+import java.awt.BorderLayout;
+import java.util.LinkedList;
+
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.TableCellEditor;
+
+import geniusweb.actions.Accept;
+import geniusweb.actions.EndNegotiation;
+import geniusweb.actions.Offer;
+import geniusweb.issuevalue.Value;
+import geniusweb.profile.Profile;
+
+/**
+ * the human GUI panel
+ *
+ */
+@SuppressWarnings("serial")
+public class MyGUI extends JPanel {
+
+	// not static because buttons are mutable (have listeners)
+	private final JButton acceptButton = new JButton("Accept");
+	private final JButton offerButton = new JButton("Place Offer");
+	private final JButton stopButton = new JButton("Stop Negotiation");
+	private final BiddingInfo info;
+
+	public MyGUI(BiddingInfo biddinginfo) {
+		if (biddinginfo == null)
+			throw new NullPointerException("biddinginfo=null");
+		this.info = biddinginfo;
+		setLayout(new BorderLayout());
+		JTable table = new JTable(new BiddingTableModel(info)) {
+			@Override
+			public TableCellEditor getCellEditor(int row, int col) {
+				if (row < 0 || row > info.getIssues().size())
+					return null;
+				String issue = info.getIssues().get(row);
+				LinkedList<Value> values = new LinkedList<Value>();
+				info.getProfile().getDomain().getValues(issue)
+						.forEach(v -> values.add(v));
+				return new DefaultCellEditor(new JComboBox<>(values.toArray()));
+			}
+		};
+		JScrollPane tablecontainer = new JScrollPane(table);
+		add(tablecontainer, BorderLayout.CENTER);
+
+		JPanel buttonPane = new JPanel();
+		buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS));
+		buttonPane.add(Box.createHorizontalGlue());
+		buttonPane.add(offerButton);
+		buttonPane.add(acceptButton);
+		buttonPane.add(stopButton);
+		add(buttonPane, BorderLayout.SOUTH);
+
+		biddinginfo.addListener(data -> updateGui(data));
+		acceptButton.addActionListener(e -> accept());
+		offerButton.addActionListener(e -> offer());
+		stopButton.addActionListener(e -> stop());
+		updateGui(false);
+	}
+
+	private void offer() {
+		info.doAction(new Offer(info.getMyId(), info.getCurrentBid()));
+	}
+
+	private void accept() {
+		info.doAction(
+				new Accept(info.getMyId(), info.getReceivedOffer().getBid()));
+	}
+
+	private void stop() {
+		info.doAction(new EndNegotiation(info.getMyId()));
+	}
+
+	/**
+	 * Update visibility of the buttons when changes occur in model
+	 */
+	private void updateGui(Object change) {
+		if (change instanceof Boolean) {
+			// boolean contains isMyTurn
+			Boolean isEnabled = (Boolean) change;
+			SwingUtilities.invokeLater(new Runnable() {
+				@Override
+				public void run() {
+					offerButton.setEnabled(isEnabled);
+					stopButton.setEnabled(isEnabled);
+					acceptButton.setEnabled(
+							isEnabled && info.getReceivedOffer() != null);
+				}
+			});
+		} else if (change instanceof Profile) {
+			JOptionPane.showMessageDialog(this,
+					"Notice, your preference profile has been changed!");
+		}
+	}
+
+}
Index: /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/BiddingInfoTest.java
===================================================================
--- /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/BiddingInfoTest.java	(revision 9)
+++ /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/BiddingInfoTest.java	(revision 9)
@@ -0,0 +1,176 @@
+package geniusweb.exampleparties.humangui;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.logging.Level;
+
+import javax.websocket.DeploymentException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import geniusweb.actions.Accept;
+import geniusweb.actions.PartyId;
+import geniusweb.issuevalue.Bid;
+import geniusweb.party.inform.Settings;
+import geniusweb.profile.Profile;
+import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profileconnection.ProfileConnectionFactory;
+import geniusweb.profileconnection.ProfileInterface;
+import geniusweb.progress.ProgressRounds;
+import geniusweb.references.Parameters;
+import geniusweb.references.ProfileRef;
+import geniusweb.references.ProtocolRef;
+import tudelft.utilities.listener.DefaultListenable;
+import tudelft.utilities.listener.Listener;
+import tudelft.utilities.logging.Reporter;
+
+/**
+ * Should test the GUI stuff. At this moment it's just a simple quick test of
+ * the GUI without much testing
+ *
+ */
+public class BiddingInfoTest {
+
+	private static final PartyId PARTY_ID = new PartyId("party1");
+	private static final ProtocolRef SAOP = new ProtocolRef("SAOP");
+	private static final PartyId otherparty = new PartyId("other");
+	private static final String PROFILE = "src/test/resources/testprofile.json";
+	private static final String PROFILE2 = "src/test/resources/testprofile2.json";
+	private final static ObjectMapper jackson = new ObjectMapper();
+
+	private final TestConnection connection = new TestConnection();
+	private final ProtocolRef protocol = mock(ProtocolRef.class);
+	private final ProgressRounds progress = mock(ProgressRounds.class);
+	private Settings settings;
+	private LinearAdditiveUtilitySpace profile, profile2;
+	private final Parameters parameters = new Parameters();
+	private Reporter reporter = mock(Reporter.class);
+	private ProfileInterface profileint;
+	private BiddingInfo info;
+
+	@Before
+	public void before() throws JsonParseException, JsonMappingException,
+			IOException, URISyntaxException, DeploymentException {
+		settings = new Settings(PARTY_ID,
+				new ProfileRef(new URI("file:" + PROFILE)), protocol, progress,
+				parameters);
+
+		String serialized = new String(Files.readAllBytes(Paths.get(PROFILE)),
+				StandardCharsets.UTF_8);
+		profile = (LinearAdditiveUtilitySpace) jackson.readValue(serialized,
+				Profile.class);
+		String serialized2 = new String(Files.readAllBytes(Paths.get(PROFILE2)),
+				StandardCharsets.UTF_8);
+		profile2 = (LinearAdditiveUtilitySpace) jackson.readValue(serialized2,
+				Profile.class);
+
+		profileint = ProfileConnectionFactory
+				.create(settings.getProfile().getURI(), reporter);
+
+		info = new BiddingInfo(settings, connection, reporter, profileint);
+	}
+
+	@Test
+	public void smokeTest() {
+		assertEquals(profile, info.getProfile());
+		assertEquals(Arrays.asList("issue2", "issue1"), info.getIssues());
+		verify(reporter, times(0)).log(any(), any());
+
+	}
+
+	@Test
+	public void testUpdateProfile() throws IOException, DeploymentException {
+		TestProfileInterface profileInterface = new TestProfileInterface(
+				profile);
+		info = new BiddingInfo(settings, connection, reporter,
+				profileInterface);
+		@SuppressWarnings("unchecked")
+		Listener<Object> testlistener = mock(Listener.class);
+		info.addListener(testlistener);
+		assertEquals(profile, info.getProfile());
+
+		// push new profile into the interface and check it's handled
+		profileInterface.updateProfile(profile2);
+		assertEquals(profile2, info.getProfile());
+		verify(testlistener, times(1)).notifyChange(profile2);
+		assertEquals(Arrays.asList("issue3", "issue2"), info.getIssues());
+		verify(reporter, times(0)).log(any(), any());
+
+	}
+
+	@Test
+	public void testActNotMyTurn() {
+		info.doAction(new Accept(PARTY_ID, new Bid(Collections.emptyMap())));
+		verify(reporter, times(1)).log(eq(Level.SEVERE), any());
+
+	}
+
+	@Test
+	public void testChangeTurn() {
+		Listener<Object> testlistener = mock(Listener.class);
+		info.addListener(testlistener);
+
+		info.setMyTurn(true);
+		verify(testlistener, times(1)).notifyChange(eq(true));
+	}
+
+	@Test
+	public void testActMyTurn() {
+		info.setMyTurn(true);
+		info.doAction(new Accept(PARTY_ID, new Bid(Collections.emptyMap())));
+		verify(reporter, times(0)).log(any(), any());
+
+	}
+
+	@Test
+	public void testSetCurrentBid() {
+		Listener<Object> testlistener = mock(Listener.class);
+		info.addListener(testlistener);
+
+		Bid bid = mock(Bid.class);
+		info.setCurrentBid(bid);
+		assertEquals(bid, info.getCurrentBid());
+		verify(testlistener, times(1)).notifyChange(bid);
+
+	}
+
+}
+
+class TestProfileInterface extends DefaultListenable<Profile>
+		implements ProfileInterface {
+
+	private Profile profile;
+
+	public TestProfileInterface(Profile profile) {
+		this.profile = profile;
+	}
+
+	public void updateProfile(Profile profile) {
+		this.profile = profile;
+		notifyListeners(profile);
+	}
+
+	@Override
+	public Profile getProfile() {
+		return profile;
+	}
+
+}
Index: /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/HumanGuiTest.java
===================================================================
--- /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/HumanGuiTest.java	(revision 9)
+++ /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/HumanGuiTest.java	(revision 9)
@@ -0,0 +1,169 @@
+package geniusweb.exampleparties.humangui;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Random;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import geniusweb.actions.EndNegotiation;
+import geniusweb.actions.Offer;
+import geniusweb.actions.PartyId;
+import geniusweb.bidspace.AllBidsList;
+import geniusweb.issuevalue.Bid;
+import geniusweb.party.Capabilities;
+import geniusweb.party.inform.ActionDone;
+import geniusweb.party.inform.Finished;
+import geniusweb.party.inform.Settings;
+import geniusweb.party.inform.YourTurn;
+import geniusweb.profile.Profile;
+import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.progress.ProgressRounds;
+import geniusweb.references.Parameters;
+import geniusweb.references.ProfileRef;
+import geniusweb.references.ProtocolRef;
+
+/**
+ * Should test the GUI stuff. At this moment it's just a simple quick test of
+ * the GUI without much testing
+ *
+ */
+public class HumanGuiTest {
+
+	private static final ProtocolRef SAOP = new ProtocolRef("SAOP");
+	private static final PartyId otherparty = new PartyId("other");
+	private static final String PROFILE = "src/test/resources/testprofile.json";
+	private final static ObjectMapper jackson = new ObjectMapper();
+
+	private HumanGui party;
+	private final TestConnection connection = new TestConnection();
+	private final ProtocolRef protocol = mock(ProtocolRef.class);
+	private final ProgressRounds progress = mock(ProgressRounds.class);
+	private Settings settings;
+	private LinearAdditiveUtilitySpace profile;
+	private final Parameters parameters = new Parameters();
+
+	@Before
+	public void before() throws JsonParseException, JsonMappingException,
+			IOException, URISyntaxException {
+		party = new HumanGui();
+		settings = new Settings(new PartyId("party1"),
+				new ProfileRef(new URI("file:" + PROFILE)), protocol, progress,
+				parameters);
+
+		String serialized = new String(Files.readAllBytes(Paths.get(PROFILE)),
+				StandardCharsets.UTF_8);
+		profile = (LinearAdditiveUtilitySpace) jackson.readValue(serialized,
+				Profile.class);
+
+	}
+
+	@After
+	public void after() {
+		party.notifyChange(new Finished(null));
+	}
+
+	@Test
+	public void smokeTest() {
+	}
+
+	@Test
+	public void getDescriptionTest() {
+		assertNotNull(party.getDescription());
+	}
+
+	@Test
+	public void getCapabilitiesTest() {
+		Capabilities capabilities = party.getCapabilities();
+		assertFalse("party does not define protocols",
+				capabilities.getProtocols().isEmpty());
+	}
+
+	@Test
+	public void testGetCapabilities() {
+		assertTrue(party.getCapabilities().getProtocols().contains(SAOP));
+	}
+
+	@Test
+	public void testInformConnection() {
+		party.connect(connection);
+		// agent should not start acting just after an inform
+		assertEquals(0, connection.getActions().size());
+	}
+
+	@Test
+	public void testInformSettings() throws InterruptedException {
+		party.connect(connection);
+		connection.notifyListeners(settings);
+		assertEquals(0, connection.getActions().size());
+		Thread.sleep(1000);
+	}
+
+	@Test
+	public void testOtherWalksAway() throws InterruptedException {
+		party.connect(connection);
+		party.notifyChange(settings);
+
+		party.notifyChange(new ActionDone(new EndNegotiation(otherparty)));
+
+		// party should not act at this point
+		assertEquals(0, connection.getActions().size());
+
+		Thread.sleep(1000);
+
+	}
+
+	@Test
+	public void testReceiveOtherBid() throws InterruptedException {
+		party.connect(connection);
+		party.notifyChange(settings);
+		Thread.sleep(1000);
+
+		AllBidsList allbids = new AllBidsList(profile.getDomain());
+		Random r = new Random();
+		party.notifyChange(new ActionDone(new Offer(otherparty,
+				allbids.get(r.nextInt(allbids.size().intValue())))));
+
+		// party should not act at this point
+		assertEquals(0, connection.getActions().size());
+
+		Thread.sleep(1000);
+
+	}
+
+	@Test
+	public void testRecvAndYourTurn() throws InterruptedException {
+		party.connect(connection);
+		party.notifyChange(settings);
+
+		party.notifyChange(new ActionDone(new Offer(otherparty, randomBid())));
+		party.notifyChange(new YourTurn());
+
+		Thread.sleep(1000);
+
+	}
+
+	private Bid randomBid() {
+		AllBidsList allbids = new AllBidsList(profile.getDomain());
+		Random r = new Random();
+		return allbids.get(r.nextInt(allbids.size().intValue()));
+
+	}
+
+}
Index: /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/MyGUITest.java
===================================================================
--- /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/MyGUITest.java	(revision 9)
+++ /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/MyGUITest.java	(revision 9)
@@ -0,0 +1,75 @@
+package geniusweb.exampleparties.humangui;
+
+import static org.mockito.Mockito.mock;
+
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.swing.JFrame;
+import javax.websocket.DeploymentException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import geniusweb.actions.Action;
+import geniusweb.actions.PartyId;
+import geniusweb.connection.ConnectionEnd;
+import geniusweb.party.inform.Inform;
+import geniusweb.party.inform.Settings;
+import geniusweb.profileconnection.ProfileConnectionFactory;
+import geniusweb.profileconnection.ProfileInterface;
+import geniusweb.progress.ProgressRounds;
+import geniusweb.references.Parameters;
+import geniusweb.references.ProfileRef;
+import geniusweb.references.ProtocolRef;
+import tudelft.utilities.logging.Reporter;
+
+public class MyGUITest {
+	private final ProtocolRef protocol = mock(ProtocolRef.class);
+	private final ProgressRounds progress = mock(ProgressRounds.class);
+	private static final String PROFILE = "src/test/resources/testprofile.json";
+	private final Parameters parameters = new Parameters();
+	private Reporter reporter = mock(Reporter.class);
+	private MyGUI gui;
+	private JFrame frame;
+	private BiddingInfo info;
+
+	@Before
+	public void before()
+			throws IOException, DeploymentException, URISyntaxException {
+		Settings settings = new Settings(new PartyId("party1"),
+				new ProfileRef(new URI("file:" + PROFILE)), protocol, progress,
+				parameters);
+
+		ProfileInterface profileint = ProfileConnectionFactory
+				.create(settings.getProfile().getURI(), reporter);
+		ConnectionEnd<Inform, Action> conn = mock(ConnectionEnd.class);
+		info = new BiddingInfo(settings, conn, reporter, profileint);
+		gui = new MyGUI(info);
+
+		// not strictly necesary but useful to visually check the process
+		frame = new JFrame();
+		Container content = frame.getContentPane();
+		content.setLayout(new BorderLayout());
+		content.add(gui, BorderLayout.CENTER);
+		frame.pack();
+		frame.setVisible(true);
+
+	}
+
+	@After
+	public void after() {
+		frame.setVisible(false);
+	}
+
+	@Test
+	public void smokeTest() throws IOException, DeploymentException,
+			URISyntaxException, InterruptedException {
+		Thread.sleep(2000);
+	}
+
+}
Index: /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/TestConnection.java
===================================================================
--- /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/TestConnection.java	(revision 9)
+++ /exampleparties/humangui/src/test/java/geniusweb/exampleparties/humangui/TestConnection.java	(revision 9)
@@ -0,0 +1,53 @@
+package geniusweb.exampleparties.humangui;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.LinkedList;
+import java.util.List;
+
+import geniusweb.actions.Action;
+import geniusweb.connection.ConnectionEnd;
+import geniusweb.party.inform.Inform;
+import geniusweb.references.Reference;
+import tudelft.utilities.listener.DefaultListenable;
+
+/**
+ * A "real" connection object, because the party is going to subscribe etc, and
+ * without a real connection we would have to do a lot of mocks that would make
+ * the test very hard to read.
+ *
+ */
+public class TestConnection extends DefaultListenable<Inform>
+		implements ConnectionEnd<Inform, Action> {
+	private List<Action> actions = new LinkedList<>();
+
+	@Override
+	public void send(Action action) throws IOException {
+		actions.add(action);
+	}
+
+	@Override
+	public Reference getReference() {
+		return null;
+	}
+
+	@Override
+	public URI getRemoteURI() {
+		return null;
+	}
+
+	@Override
+	public void close() {
+
+	}
+
+	@Override
+	public Error getError() {
+		return null;
+	}
+
+	public List<Action> getActions() {
+		return actions;
+	}
+
+}
Index: /exampleparties/humangui/src/test/resources/testprofile.json
===================================================================
--- /exampleparties/humangui/src/test/resources/testprofile.json	(revision 9)
+++ /exampleparties/humangui/src/test/resources/testprofile.json	(revision 9)
@@ -0,0 +1,45 @@
+{
+	"LinearAdditiveUtilitySpace": {
+		"issueUtilities": {
+			"issue2": {
+				"numberutils": {
+					"lowValue": 12,
+					"lowUtility": 0.3,
+					"highValue": 18,
+					"highUtility": 0.9
+				}
+			},
+			"issue1": {
+				"discreteutils": {
+					"valueUtilities": {
+						"issue1value1": 0.2,
+						"issue1value2": 0.8
+					}
+				}
+			}
+		},
+		"issueWeights": {
+			"issue2": 0.4,
+			"issue1": 0.6
+		},
+		"domain": {
+			"name": "test",
+			"issuesValues": {
+				"issue2": {
+					"range": ["12", "18", "1"]
+				},
+				"issue1": {
+					"values": ["issue1value1", "issue1value2"]
+				}
+			}
+		},
+		"name": "testprofile",
+				"reservationBid": {
+			"issuevalues": {
+				"issue1": "issuevalue1",
+				"issue2": "12"
+			}
+		}
+		
+	}
+}
Index: /exampleparties/humangui/src/test/resources/testprofile2.json
===================================================================
--- /exampleparties/humangui/src/test/resources/testprofile2.json	(revision 9)
+++ /exampleparties/humangui/src/test/resources/testprofile2.json	(revision 9)
@@ -0,0 +1,45 @@
+{
+	"LinearAdditiveUtilitySpace": {
+		"issueUtilities": {
+			"issue2": {
+				"numberutils": {
+					"lowValue": 12,
+					"lowUtility": 0.3,
+					"highValue": 18,
+					"highUtility": 0.9
+				}
+			},
+			"issue3": {
+				"discreteutils": {
+					"valueUtilities": {
+						"issue3value1": 0.2,
+						"issue3value2": 0.8
+					}
+				}
+			}
+		},
+		"issueWeights": {
+			"issue2": 0.4,
+			"issue3": 0.6
+		},
+		"domain": {
+			"name": "test",
+			"issuesValues": {
+				"issue2": {
+					"range": ["12", "18", "1"]
+				},
+				"issue3": {
+					"values": ["issue3value1", "issue3value2"]
+				}
+			}
+		},
+		"name": "testprofile",
+				"reservationBid": {
+			"issuevalues": {
+				"issue2": "12",
+				"issue3": "issuevalue1"
+			}
+		}
+		
+	}
+}
Index: /exampleparties/linear/pom.xml
===================================================================
--- /exampleparties/linear/pom.xml	(revision 8)
+++ /exampleparties/linear/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>linear</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -33,5 +33,5 @@
 			<groupId>geniusweb.exampleparties</groupId>
 			<artifactId>timedependentparty</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
Index: /exampleparties/randomparty/pom.xml
===================================================================
--- /exampleparties/randomparty/pom.xml	(revision 8)
+++ /exampleparties/randomparty/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>randomparty</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -33,5 +33,5 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>party</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 
@@ -39,14 +39,14 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>bidspace</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>geniusweb</groupId>
+			<artifactId>profileconnection</artifactId>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>tudelft.utilities</groupId>
 			<artifactId>logging</artifactId>
-			<version>1.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>geniusweb</groupId>
-			<artifactId>profileconnection</artifactId>
 			<version>1.0.0</version>
 		</dependency>
Index: /exampleparties/randomparty/src/main/java/geniusweb/exampleparties/randomparty/RandomParty.java
===================================================================
--- /exampleparties/randomparty/src/main/java/geniusweb/exampleparties/randomparty/RandomParty.java	(revision 8)
+++ /exampleparties/randomparty/src/main/java/geniusweb/exampleparties/randomparty/RandomParty.java	(revision 9)
@@ -25,5 +25,5 @@
 import geniusweb.profile.PartialOrdering;
 import geniusweb.profile.Profile;
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.UtilitySpace;
 import geniusweb.profileconnection.ProfileConnectionFactory;
 import geniusweb.profileconnection.ProfileInterface;
@@ -57,5 +57,6 @@
 			if (info instanceof Settings) {
 				Settings settings = (Settings) info;
-				this.profileint = ProfileConnectionFactory.create(settings.getProfile().getURI(), getReporter());
+				this.profileint = ProfileConnectionFactory
+						.create(settings.getProfile().getURI(), getReporter());
 				this.me = settings.getID();
 				this.progress = settings.getProgress();
@@ -74,5 +75,5 @@
 			}
 		} catch (Exception e) {
-			getReporter().log(Level.SEVERE, "Failed to handle info", e);
+			throw new RuntimeException("Failed to handle info", e);
 		}
 	}
@@ -81,7 +82,9 @@
 	public Capabilities getCapabilities() {
 		try {
-			return new Capabilities(new HashSet<>(Arrays.asList(new ProtocolRef(new URI("SAOP")))));
+			return new Capabilities(new HashSet<>(
+					Arrays.asList(new ProtocolRef(new URI("SAOP")))));
 		} catch (URISyntaxException e) {
-			getReporter().log(Level.SEVERE, "Failed to create capabilities URI", e);
+			getReporter().log(Level.SEVERE, "Failed to create capabilities URI",
+					e);
 			return null;
 		}
@@ -99,5 +102,6 @@
 		} else {
 			// for demo. Obviously full bids have higher util in general
-			AllPartialBidsList bidspace = new AllPartialBidsList(profileint.getProfile().getDomain());
+			AllPartialBidsList bidspace = new AllPartialBidsList(
+					profileint.getProfile().getDomain());
 			Bid bid = null;
 			for (int attempt = 0; attempt < 20 && !isGood(bid); attempt++) {
@@ -115,11 +119,13 @@
 			return false;
 		Profile profile = profileint.getProfile();
-		if (profile instanceof LinearAdditiveUtilitySpace) {
-			return ((LinearAdditiveUtilitySpace) profile).getUtility(bid).doubleValue() > 0.6;
+		if (profile instanceof UtilitySpace) {
+			return ((UtilitySpace) profile).getUtility(bid).doubleValue() > 0.6;
 		}
 		if (profile instanceof PartialOrdering) {
-			return ((PartialOrdering) profile).isPreferredOrEqual(bid, profile.getReservationBid());
+			return ((PartialOrdering) profile).isPreferredOrEqual(bid,
+					profile.getReservationBid());
 		}
-		throw new IllegalArgumentException("Can not handle profile type " + profile.getClass());
+		throw new IllegalArgumentException(
+				"Can not handle profile type " + profile.getClass());
 	}
 
Index: /exampleparties/randomparty/src/test/java/geniusweb/exampleparties/randomparty/RandomPartyTest.java
===================================================================
--- /exampleparties/randomparty/src/test/java/geniusweb/exampleparties/randomparty/RandomPartyTest.java	(revision 8)
+++ /exampleparties/randomparty/src/test/java/geniusweb/exampleparties/randomparty/RandomPartyTest.java	(revision 9)
@@ -33,5 +33,5 @@
 import geniusweb.actions.PartyId;
 import geniusweb.bidspace.AllBidsList;
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.issuevalue.Bid;
 import geniusweb.party.Capabilities;
@@ -107,5 +107,5 @@
 	public void testInformSettings() {
 		party.connect(connection);
-		connection.notifyChange(settings);
+		connection.notifyListeners(settings);
 		assertEquals(0, connection.getActions().size());
 	}
@@ -199,5 +199,5 @@
  */
 class TestConnection extends DefaultListenable<Inform>
-		implements Connection<Inform, Action> {
+		implements ConnectionEnd<Inform, Action> {
 	private List<Action> actions = new LinkedList<>();
 
Index: /exampleparties/randompartypy/pom.xml
===================================================================
--- /exampleparties/randompartypy/pom.xml	(revision 8)
+++ /exampleparties/randompartypy/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>randompyparty</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -31,5 +31,5 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>pythonadapter</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 
@@ -37,10 +37,10 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>bidspace</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>geniusweb</groupId>
 			<artifactId>profileconnection</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
Index: /exampleparties/randompartypy/src/main/resources/RandomParty.py
===================================================================
--- /exampleparties/randompartypy/src/main/resources/RandomParty.py	(revision 8)
+++ /exampleparties/randompartypy/src/main/resources/RandomParty.py	(revision 9)
@@ -24,5 +24,5 @@
 import geniusweb.profile.Profile as Profile
 import geniusweb.profile.PartialOrdering as PartialOrdering
-import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace as LinearAdditiveUtilitySpace
+import geniusweb.profile.utilityspace.UtilitySpace as UtilitySpace
 import geniusweb.references.ProfileRef as ProfileRef
 import geniusweb.references.ProtocolRef as ProtocolRef
@@ -97,5 +97,5 @@
 			return false
 		profile = self.profile.getProfile()
-		if isinstance(profile, LinearAdditiveUtilitySpace):
+		if isinstance(profile, UtilitySpace):
 			return profile.getUtility(bid).doubleValue() > 0.6;
 		if isinstance(profile, PartialOrdering):
Index: /exampleparties/randompartypy/src/test/java/geniusweb/exampleparties/randompartypy/RandomPartyTest.java
===================================================================
--- /exampleparties/randompartypy/src/test/java/geniusweb/exampleparties/randompartypy/RandomPartyTest.java	(revision 8)
+++ /exampleparties/randompartypy/src/test/java/geniusweb/exampleparties/randompartypy/RandomPartyTest.java	(revision 9)
@@ -31,5 +31,5 @@
 import geniusweb.actions.PartyId;
 import geniusweb.bidspace.AllBidsList;
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.issuevalue.Bid;
 import geniusweb.party.Capabilities;
@@ -111,5 +111,5 @@
 	public void testInformSettings() {
 		party.connect(connection);
-		connection.notifyChange(settings);
+		connection.notifyListeners(settings);
 		assertEquals(0, connection.getActions().size());
 	}
@@ -190,5 +190,5 @@
  */
 class TestConnection extends DefaultListenable<Inform>
-		implements Connection<Inform, Action> {
+		implements ConnectionEnd<Inform, Action> {
 	private List<Action> actions = new LinkedList<>();
 
Index: /exampleparties/timedependentparty/pom.xml
===================================================================
--- /exampleparties/timedependentparty/pom.xml	(revision 8)
+++ /exampleparties/timedependentparty/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb.exampleparties</groupId>
 	<artifactId>timedependentparty</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -33,5 +33,5 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>party</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 
@@ -39,14 +39,14 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>bidspace</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>geniusweb</groupId>
+			<artifactId>profileconnection</artifactId>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>tudelft.utilities</groupId>
 			<artifactId>logging</artifactId>
-			<version>1.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>geniusweb</groupId>
-			<artifactId>profileconnection</artifactId>
 			<version>1.0.0</version>
 		</dependency>
Index: /exampleparties/timedependentparty/src/test/java/geniusweb/exampleparties/timedependentparty/TimeDependentPartyTest.java
===================================================================
--- /exampleparties/timedependentparty/src/test/java/geniusweb/exampleparties/timedependentparty/TimeDependentPartyTest.java	(revision 8)
+++ /exampleparties/timedependentparty/src/test/java/geniusweb/exampleparties/timedependentparty/TimeDependentPartyTest.java	(revision 9)
@@ -33,5 +33,5 @@
 import geniusweb.actions.PartyId;
 import geniusweb.bidspace.AllBidsList;
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.issuevalue.Bid;
 import geniusweb.party.Capabilities;
@@ -118,5 +118,5 @@
 	public void testInformSettings() {
 		party.connect(connection);
-		connection.notifyChange(settings);
+		connection.notifyListeners(settings);
 		assertEquals(0, connection.getActions().size());
 	}
@@ -223,5 +223,5 @@
  */
 class TestConnection extends DefaultListenable<Inform>
-		implements Connection<Inform, Action> {
+		implements ConnectionEnd<Inform, Action> {
 	private List<Action> actions = new LinkedList<>();
 
Index: /issuevalue/pom.xml
===================================================================
--- /issuevalue/pom.xml	(revision 8)
+++ /issuevalue/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>issuevalue</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
Index: /issuevalue/src/main/java/geniusweb/issuevalue/Bid.java
===================================================================
--- /issuevalue/src/main/java/geniusweb/issuevalue/Bid.java	(revision 8)
+++ /issuevalue/src/main/java/geniusweb/issuevalue/Bid.java	(revision 9)
@@ -98,4 +98,12 @@
 	}
 
+	/**
+	 * 
+	 * @return (unmodifyable) map with all issues and values in the bid.
+	 */
+	public Map<String, Value> getIssueValues() {
+		return Collections.unmodifiableMap(issuevalues);
+	}
+
 	@Override
 	public String toString() {
Index: /party/pom.xml
===================================================================
--- /party/pom.xml	(revision 8)
+++ /party/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>party</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -31,25 +31,25 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>timeline</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>geniusweb</groupId>
 			<artifactId>profile</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>geniusweb</groupId>
 			<artifactId>events</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>geniusweb</groupId>
+			<artifactId>references</artifactId>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>tudelft.utilities</groupId>
 			<artifactId>listener</artifactId>
-			<version>1.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>geniusweb</groupId>
-			<artifactId>references</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
Index: /party/src/main/java/geniusweb/party/DefaultParty.java
===================================================================
--- /party/src/main/java/geniusweb/party/DefaultParty.java	(revision 8)
+++ /party/src/main/java/geniusweb/party/DefaultParty.java	(revision 9)
@@ -2,5 +2,5 @@
 
 import geniusweb.actions.Action;
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.party.inform.Inform;
 import tudelft.utilities.listener.Listener;
@@ -13,5 +13,5 @@
  */
 public abstract class DefaultParty implements Party, Listener<Inform> {
-	private Connection<Inform, Action> connection = null;
+	private ConnectionEnd<Inform, Action> connection = null;
 	protected Reporter reporter;
 
@@ -25,5 +25,5 @@
 
 	@Override
-	public void connect(Connection<Inform, Action> connection) {
+	public void connect(ConnectionEnd<Inform, Action> connection) {
 		this.connection = connection;
 		connection.addListener(this);
@@ -47,5 +47,5 @@
 	 *         connected.
 	 */
-	public Connection<Inform, Action> getConnection() {
+	public ConnectionEnd<Inform, Action> getConnection() {
 		return connection;
 	}
Index: /pom.xml
===================================================================
--- /pom.xml	(revision 8)
+++ /pom.xml	(revision 9)
@@ -13,5 +13,5 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
Index: /profile/pom.xml
===================================================================
--- /profile/pom.xml	(revision 8)
+++ /profile/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>profile</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -31,10 +31,10 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>issuevalue</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>geniusweb</groupId>
 			<artifactId>references</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 
Index: /profile/src/main/java/geniusweb/profile/Profile.java
===================================================================
--- /profile/src/main/java/geniusweb/profile/Profile.java	(revision 8)
+++ /profile/src/main/java/geniusweb/profile/Profile.java	(revision 9)
@@ -7,4 +7,5 @@
 import geniusweb.issuevalue.Domain;
 import geniusweb.profile.utilityspace.LinearAdditiveUtilitySpace;
+import geniusweb.profile.utilityspace.SumOfGroupsUtilitySpace;
 
 /**
@@ -17,5 +18,6 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.WRAPPER_OBJECT)
 @JsonSubTypes({ @JsonSubTypes.Type(value = LinearAdditiveUtilitySpace.class),
-		@JsonSubTypes.Type(value = DefaultPartialOrdering.class) })
+		@JsonSubTypes.Type(value = DefaultPartialOrdering.class),
+		@JsonSubTypes.Type(value = SumOfGroupsUtilitySpace.class) })
 public interface Profile {
 
@@ -33,8 +35,9 @@
 	/**
 	 * 
-	 * @return a (hypothetical) bid that is the best alternative to a non-agreement.
-	 *         Only bids that are {@link #isPreferredOrEqual(Bid, Bid)} should be
-	 *         accepted. If a negotiation does not reach an agreement, the party can
-	 *         get this offer somewhere else. This replaces the older notion of a
+	 * @return a (hypothetical) bid that is the best alternative to a
+	 *         non-agreement. Only bids that are
+	 *         {@link #isPreferredOrEqual(Bid, Bid)} should be accepted. If a
+	 *         negotiation does not reach an agreement, the party can get this
+	 *         offer somewhere else. This replaces the older notion of a
 	 *         "reservation value" and is more general. If null, there is no
 	 *         reservation bid and any agreement is better than no agreement.
Index: /profile/src/main/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilities.java
===================================================================
--- /profile/src/main/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilities.java	(revision 8)
+++ /profile/src/main/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilities.java	(revision 9)
@@ -8,4 +8,5 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonTypeName;
 
 import geniusweb.issuevalue.DiscreteValue;
@@ -13,6 +14,4 @@
 import geniusweb.issuevalue.Value;
 import geniusweb.issuevalue.ValueSet;
-
-import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
@@ -37,19 +36,23 @@
 	 * create new object based on the given mapping from values to utilities.
 	 * 
-	 * @param valueUtils map with key {@link DiscreteValue}s and value a Double in
-	 *                   the range [0,1].
+	 * @param valueUtils map with key {@link DiscreteValue}s and value a Double
+	 *                   in the range [0,1].
 	 * @throws NullPointerException     if one of the args is null
 	 * @throws IllegalArgumentException if values are not in range [0,1].
 	 */
-	public DiscreteValueSetUtilities(Map<DiscreteValue, BigDecimal> valueUtils) {
+	public DiscreteValueSetUtilities(
+			Map<DiscreteValue, BigDecimal> valueUtils) {
 		if (valueUtils == null) {
 			throw new NullPointerException("valueUtils==null");
 		}
 		if (valueUtils.keySet().contains(null)) {
-			throw new NullPointerException("one of the keys in valueUtils is null");
+			throw new NullPointerException(
+					"one of the keys in valueUtils is null");
 		}
 		if (valueUtils.values().stream()
-				.anyMatch(v -> v == null || v.compareTo(BigDecimal.ZERO) < 0 || v.compareTo(BigDecimal.ONE) > 0)) {
-			throw new IllegalArgumentException("Weights in valueUtils must all be in [0,1]");
+				.anyMatch(v -> v == null || v.compareTo(BigDecimal.ZERO) < 0
+						|| v.compareTo(BigDecimal.ONE) > 0)) {
+			throw new IllegalArgumentException(
+					"Weights in valueUtils must all be in [0,1]");
 		}
 		this.valueUtilities.putAll(valueUtils);
@@ -68,9 +71,12 @@
 	public String isFitting(ValueSet valueset) {
 		if (!(valueset instanceof DiscreteValueSet)) {
-			return "The utilities are for a discrete valueset but the given values are " + valueset;
+			return "The utilities are for a discrete valueset but the given values are "
+					+ valueset;
 		}
 		DiscreteValueSet discvalueset = (DiscreteValueSet) valueset;
-		if (!valueUtilities.keySet().equals(new HashSet<>(discvalueset.getValues())))
-			return "The values in the set " + valueset + " do not match the values mapped to utilities "
+		if (!valueUtilities.keySet()
+				.equals(new HashSet<>(discvalueset.getValues())))
+			return "The values in the set " + valueset
+					+ " do not match the values mapped to utilities "
 					+ valueUtilities.keySet();
 		return null;
@@ -79,5 +85,5 @@
 	@Override
 	public String toString() {
-		return "ValueSetUtilities" + valueUtilities;
+		return "DiscreteValueSetUtilities" + valueUtilities;
 	}
 
@@ -86,5 +92,6 @@
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((valueUtilities == null) ? 0 : valueUtilities.hashCode());
+		result = prime * result
+				+ ((valueUtilities == null) ? 0 : valueUtilities.hashCode());
 		return result;
 	}
Index: /profile/src/main/java/geniusweb/profile/utilityspace/NumberValueSetUtilities.java
===================================================================
--- /profile/src/main/java/geniusweb/profile/utilityspace/NumberValueSetUtilities.java	(revision 8)
+++ /profile/src/main/java/geniusweb/profile/utilityspace/NumberValueSetUtilities.java	(revision 9)
@@ -139,5 +139,5 @@
 	@Override
 	public String toString() {
-		return "NumberValUtility(" + lowValue + "->" + lowUtility + ","
+		return "NumberValueSetUtilities(" + lowValue + "->" + lowUtility + ","
 				+ highValue + "->" + highUtility + ")";
 	}
Index: /profile/src/main/java/geniusweb/profile/utilityspace/PartsUtilities.java
===================================================================
--- /profile/src/main/java/geniusweb/profile/utilityspace/PartsUtilities.java	(revision 9)
+++ /profile/src/main/java/geniusweb/profile/utilityspace/PartsUtilities.java	(revision 9)
@@ -0,0 +1,244 @@
+package geniusweb.profile.utilityspace;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import geniusweb.issuevalue.Value;
+import geniusweb.issuevalue.ValueSet;
+
+/**
+ * Contains utilities of a ProductOfValue of a {@link SumOfGroupsUtilitySpace}.
+ * So this is similar to a DiscreteValueSetUtilities but instead of issues this
+ * contains an (ordered) list of issues. This object serializes to something
+ * like <code> 
+ * {"partsutils":
+ * {"issues":["issue1","issue2"],
+ * "utilslist":[{"values":["low","low"],"util":0.3},{"values":["high","high"],"util":0.9}]}}
+ </code> The issues field contains a list of N issues in the domain, The
+ * utilslist contains a list of dictionaries, with "values" containing a list of
+ * N issue values, in the same order as the issues list and with "util"
+ * containng the utility value of that set of values.
+ * <p>
+ */
+@JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE)
+@JsonTypeName("partsutils")
+public class PartsUtilities implements ValueSetUtilities {
+	private final List<String> issues;
+	// the real but not-serializable values (because Map can only have String
+	// keys in jackson)
+	private transient final Map<ProductOfValue, BigDecimal> utilities = new HashMap<>();
+	// copy only for serializing
+	private final List<PartUtil> utilslist = new LinkedList<>();
+
+	/**
+	 * 
+	 * @param issues
+	 * @param utils  with keys: list of values and value: utility value for that
+	 *               list of values. All list-of-values missing from the map are
+	 *               assumed to have utility 0. This includes partial bids where
+	 *               list-of-values contain null objects.
+	 */
+	public PartsUtilities(List<String> issues,
+			Map<ProductOfValue, BigDecimal> utils) {
+		if (issues == null || utils == null) {
+			throw new IllegalArgumentException(
+					"issues and utils must be not null");
+		}
+
+		this.issues = issues;
+		this.utilities.putAll(utils);
+
+		checkUtilities();
+		for (ProductOfValue pval : utils.keySet()) {
+			utilslist.add(new PartUtil(pval.getValues(), utils.get(pval)));
+		}
+	}
+
+	@JsonCreator
+	public PartsUtilities(@JsonProperty("issues") List<String> issues,
+			@JsonProperty("utilslist") List<PartUtil> utilslist) {
+		this(issues, list2map(utilslist));
+	}
+
+	/**
+	 * 
+	 * @param pval the {@link ProductOfValue} value
+	 * @return the utility of the value, in the same order as
+	 *         {@link #getIssues()}. Returns 0 if there is no utility set for
+	 *         the given combination of values. Notice, partial bids will
+	 *         usually have utility 0.
+	 * 
+	 */
+	@Override
+	public BigDecimal getUtility(Value pval) {
+		BigDecimal val = utilities.get(pval);
+		if (val == null)
+			return BigDecimal.ZERO;
+		return val;
+	}
+
+	@Override
+	public String isFitting(ValueSet valueset) {
+		return null; // what can we tests here?
+	}
+
+	/**
+	 * @return the issues that are contained here.
+	 */
+	public List<String> getIssues() {
+		return issues;
+	}
+
+	/**
+	 * 
+	 * @return map with all available values and their utilities. The map and
+	 *         its contents should all be immutable.
+	 */
+	public Map<ProductOfValue, BigDecimal> getUtilities() {
+		return Collections.unmodifiableMap(utilities);
+	}
+
+	/**
+	 * 
+	 * @param other another {@link PartsUtilities} map. The issues in the other
+	 *              map must be different from {@link #issues}.
+	 * @return new PartsUtils, with the powermap of all combinations of one
+	 *         element from this and one from the other map, and with the
+	 *         utilities computed as the sum of thisvalue + othervalue.
+	 */
+	public PartsUtilities add(PartsUtilities other) {
+		for (String issue : issues) {
+			if (other.issues.contains(issue)) {
+				throw new IllegalArgumentException(
+						"Issue " + issue + " exists already");
+			}
+		}
+
+		List<String> combinedissues = new LinkedList<String>(issues);
+		combinedissues.addAll(other.issues);
+
+		Map<ProductOfValue, BigDecimal> combinedvalues = new HashMap<>();
+		for (ProductOfValue productOfValue : this.utilities.keySet()) {
+			for (ProductOfValue otherProductOfValue : other.utilities
+					.keySet()) {
+				BigDecimal combinedutil = getUtility(productOfValue)
+						.add(other.getUtility(otherProductOfValue));
+				combinedvalues.put(productOfValue.merge(otherProductOfValue),
+						combinedutil);
+			}
+		}
+		return new PartsUtilities(combinedissues, combinedvalues);
+
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((issues == null) ? 0 : issues.hashCode());
+		result = prime * result
+				+ ((utilities == null) ? 0 : utilities.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		PartsUtilities other = (PartsUtilities) obj;
+		if (issues == null) {
+			if (other.issues != null)
+				return false;
+		} else if (!issues.equals(other.issues))
+			return false;
+		if (utilities == null) {
+			if (other.utilities != null)
+				return false;
+		} else if (!utilities.equals(other.utilities))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "PartsUtilities[" + issues + "," + utilities + "]";
+	}
+
+	private void checkUtilities() {
+		if (utilities.values().stream()
+				.anyMatch(v -> v == null || v.compareTo(BigDecimal.ZERO) < 0
+						|| v.compareTo(BigDecimal.ONE) > 0)) {
+			throw new IllegalArgumentException(
+					"part weights must all be in [0,1]");
+		}
+	}
+
+	private static Map<ProductOfValue, BigDecimal> list2map(
+			List<PartUtil> list) {
+		Map<ProductOfValue, BigDecimal> map = new HashMap<>();
+		for (PartUtil partutil : list) {
+			map.put(new ProductOfValue(partutil.getValues()),
+					partutil.getUtil());
+		}
+		return map;
+	}
+
+	/**
+	 * 
+	 * @return the max utility of all values contained here.
+	 */
+	public BigDecimal getMaxUtility() {
+		BigDecimal maxutil = BigDecimal.ZERO;
+		for (ProductOfValue vakye : utilities.keySet()) {
+			if (utilities.get(vakye).compareTo(maxutil) > 0) {
+				maxutil = utilities.get(vakye);
+			}
+
+		}
+		return maxutil;
+	}
+
+}
+
+/**
+ * contains list of values, and the utility for this combi of values. The values
+ * make only sense with a corresponding list of issues, but that is managed in
+ * (see {@link PartsUtilities}.
+ * <p>
+ * immutable.
+ */
+@JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE)
+class PartUtil {
+	private final List<Value> values;
+
+	private final BigDecimal util;
+
+	@JsonCreator
+	public PartUtil(@JsonProperty("values") List<Value> values,
+			@JsonProperty("util") BigDecimal util) {
+		this.values = values;
+		this.util = util;
+	}
+
+	public List<Value> getValues() {
+		return values;
+	}
+
+	public BigDecimal getUtil() {
+		return util;
+	}
+}
Index: /profile/src/main/java/geniusweb/profile/utilityspace/ProductOfValue.java
===================================================================
--- /profile/src/main/java/geniusweb/profile/utilityspace/ProductOfValue.java	(revision 9)
+++ /profile/src/main/java/geniusweb/profile/utilityspace/ProductOfValue.java	(revision 9)
@@ -0,0 +1,75 @@
+package geniusweb.profile.utilityspace;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import geniusweb.issuevalue.Value;
+
+/**
+ * A {@link Value} that is the product of some existing values
+ */
+@JsonDeserialize(using = JsonDeserializer.None.class)
+public class ProductOfValue implements Value {
+	private final List<Value> values = new ArrayList<Value>();
+
+	/**
+	 * @param values the values to make a product of
+	 */
+	@JsonCreator
+	public ProductOfValue(List<Value> newvals) {
+		values.addAll(newvals);
+	}
+
+	@JsonValue
+	public List<Value> getValues() {
+		return values;
+	}
+
+	@Override
+	public String toString() {
+		return values.toString();
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((values == null) ? 0 : values.hashCode());
+		return result;
+	}
+
+	/**
+	 * 
+	 * @param other a {@link ProductOfValue} with more issues to be merged into
+	 *              this.
+	 * @return new ProductOfValue that contains this and other values.
+	 */
+	public ProductOfValue merge(ProductOfValue other) {
+		List<Value> newvalues = new ArrayList<Value>(values);
+		newvalues.addAll(other.getValues());
+		return new ProductOfValue(newvalues);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ProductOfValue other = (ProductOfValue) obj;
+		if (values == null) {
+			if (other.values != null)
+				return false;
+		} else if (!values.equals(other.values))
+			return false;
+		return true;
+	}
+
+}
Index: /profile/src/main/java/geniusweb/profile/utilityspace/SumOfGroupsUtilitySpace.java
===================================================================
--- /profile/src/main/java/geniusweb/profile/utilityspace/SumOfGroupsUtilitySpace.java	(revision 9)
+++ /profile/src/main/java/geniusweb/profile/utilityspace/SumOfGroupsUtilitySpace.java	(revision 9)
@@ -0,0 +1,279 @@
+package geniusweb.profile.utilityspace;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import geniusweb.issuevalue.Bid;
+import geniusweb.issuevalue.Domain;
+import geniusweb.issuevalue.NumberValueSet;
+import geniusweb.issuevalue.Value;
+import geniusweb.profile.DefaultProfile;
+
+/**
+ * This is a utility space that defines the utility of bids as a sum of the
+ * utilities of a number of subsets, or groups, of the issue values.
+ * <p>
+ * A group defines the utility of a non-empty subset of the issues in the
+ * domain. The parts are non-overlapping. Missing issue values have utility 0.
+ * <p>
+ * This space enables handling {@link UtilitySpace}s that are not simply linear
+ * additive, but with interacting issue values. For example, if you would like
+ * to have a car with good speakers but only if there is also a good hifi set,
+ * you can make a part that has {@link PartsUtilities} like
+ * <code> { { speakers:yes, hifi:yes }:1, {speakers, no: hifh:yes}:0.2, ...} </code>
+ * <p>
+ * NOTICE this space is completely discrete. There is no equivalent of the
+ * {@link NumberValueSet} here.
+ */
+@JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE)
+public class SumOfGroupsUtilitySpace extends DefaultProfile
+		implements UtilitySpace {
+	/**
+	 * the key is the part name, the value is the valuesetutilities for this
+	 * issue. Should be immutable so do not return direct access to this field.
+	 */
+	private final HashMap<String, PartsUtilities> partUtilities = new HashMap<>();
+
+	/**
+	 * @param domain  the {@link Domain} in which this profile is defined.
+	 * @param name    the name of this profile. Must be simple name (a-Z, 0-9)
+	 * @param utils   a map with key: part names (String) and value: the
+	 *                {@link PartsUtilities} for that part. There MUST NOT be a
+	 *                null part name. All values MUST NOT be null. The
+	 *                PartsUtilities must match the
+	 * @param weights the weight of each part, for the computation of the
+	 *                weighted sum. The parts must be the same as those in the
+	 *                utils map. All weights MUST NOT be null. The weights MUST
+	 *                sum to 1.
+	 * @param resBid  the reservation bid. Only bids that are
+	 *                {@link #isPreferredOrEqual(Bid, Bid)} should be accepted.
+	 *                Can be null, meaning that there is no reservation bid and
+	 *                any agreement is better than no agreement.
+	 * @throws NullPointerException     if values are incorrectly null.
+	 * @throws IllegalArgumentException if preconditions not met.
+	 */
+	@JsonCreator
+	public SumOfGroupsUtilitySpace(@JsonProperty("domain") Domain domain,
+			@JsonProperty("name") String name,
+			@JsonProperty("partUtilities") HashMap<String, PartsUtilities> partutils,
+			// @JsonProperty("partWeights") Map<String, BigDecimal> weights,
+			@JsonProperty("reservationBid") Bid resBid) {
+		super(name, domain, resBid);
+		this.partUtilities.putAll(partutils);
+
+		String err = checkParts();
+		if (err != null) {
+			throw new IllegalArgumentException(err);
+		}
+	}
+
+	/**
+	 * Copy settings in las. This will have the exact same utilities as the las
+	 * but this then gives you the power to change it into a non-linear space by
+	 * grouping.
+	 * 
+	 * @param las the {@link LinearAdditiveUtilitySpace} to be converted/copied.
+	 * 
+	 */
+	public SumOfGroupsUtilitySpace(LinearAdditiveUtilitySpace las) {
+		this(las.getDomain(), las.getName(), las2parts(las),
+				las.getReservationBid());
+	}
+
+	@Override
+	public BigDecimal getUtility(Bid bid) {
+		return partUtilities.keySet().stream()
+				.map(partname -> util(partname, bid))
+				.reduce(BigDecimal.ZERO, BigDecimal::add);
+	}
+
+	@Override
+	public String toString() {
+		return "PartialAdditive[" + partUtilities + "," + getReservationBid()
+				+ "]";
+	}
+
+	/**
+	 * 
+	 * @param partnames   the partnames to remove from this. There must be at
+	 *                    least 2 parts
+	 * @param newpartname the name of the new part that contains all partnames,
+	 *                    grouped into 1 "issue". This name must not be an issue
+	 *                    in this.
+	 * @return new {@link SumOfGroupsUtilitySpace} that takes all partnames out
+	 *         of this, and makes a newaprtname that contains these.
+	 */
+	public SumOfGroupsUtilitySpace group(List<String> partnames,
+			String newpartname) {
+		final Set<String> allpartnames = partUtilities.keySet();
+
+		if (partnames.size() < 2) {
+			throw new IllegalArgumentException(
+					"Group must contain at least 2 parts");
+		}
+		if (allpartnames.contains(newpartname)) {
+			throw new IllegalArgumentException(
+					"newpartname " + newpartname + " is already in use");
+		}
+		for (String name : partnames) {
+			if (!allpartnames.contains(name)) {
+				throw new IllegalArgumentException("Unknown part name " + name);
+			}
+		}
+
+		HashMap<String, PartsUtilities> newutils = new HashMap<String, PartsUtilities>();
+
+		PartsUtilities newpartutils = null;
+
+		for (String name : partUtilities.keySet()) {
+			if (partnames.contains(name)) {
+				if (newpartutils == null) {
+					newpartutils = partUtilities.get(name);
+				} else {
+					newpartutils = newpartutils.add(partUtilities.get(name));
+				}
+			} else {
+				newutils.put(name, partUtilities.get(name));
+			}
+		}
+		newutils.put(newpartname, newpartutils);
+
+		return new SumOfGroupsUtilitySpace(getDomain(), getName(), newutils,
+				getReservationBid());
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result
+				+ ((partUtilities == null) ? 0 : partUtilities.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		SumOfGroupsUtilitySpace other = (SumOfGroupsUtilitySpace) obj;
+		if (partUtilities == null) {
+			if (other.partUtilities != null)
+				return false;
+		} else if (!partUtilities.equals(other.partUtilities))
+			return false;
+		return true;
+	}
+
+	/***************************** private funcs ***************************/
+	/**
+	 * 
+	 * @param partname the name of the part to get the utility of
+	 * @param bid      the bid
+	 * @return weighted util of just the part: utilities[part].getUtility(part
+	 *         of bid)
+	 */
+	private BigDecimal util(String partname, Bid bid) {
+		PartsUtilities partutils = partUtilities.get(partname);
+		ProductOfValue value = collectValues(bid, partutils);
+		return partutils.getUtility(value);
+	}
+
+	/**
+	 * 
+	 * @param bid       a full bid
+	 * @param partutils the part utils for which a list of values from the bid
+	 *                  is needed
+	 * @return a list of values from the given bid, ordered as indicated in
+	 *         partutils
+	 */
+	private ProductOfValue collectValues(Bid bid, PartsUtilities partutils) {
+		List<Value> values = new LinkedList<>();
+		for (String issue : partutils.getIssues()) {
+			values.add(bid.getValue(issue));
+		}
+		return new ProductOfValue(values);
+	}
+
+	/**
+	 * 
+	 * @param las a {@link LinearAdditiveUtilitySpace}
+	 * @return a Map with partname-PartsUtilities. The partnames are identical
+	 *         to the issues in the given las.
+	 */
+	private static HashMap<String, PartsUtilities> las2parts(
+			LinearAdditiveUtilitySpace las) {
+
+		HashMap<String, PartsUtilities> map = new HashMap<>();
+		for (String issue : las.getUtilities().keySet()) {
+			ValueSetUtilities valset = las.getUtilities().get(issue);
+			Map<ProductOfValue, BigDecimal> utilslist = new HashMap<>();
+			BigDecimal weight = las.getWeight(issue);
+			for (Value val : las.getDomain().getValues(issue)) {
+				BigDecimal util = valset.getUtility(val).multiply(weight);
+				if (BigDecimal.ZERO.compareTo(util) != 0) {
+					utilslist.put(new ProductOfValue(Arrays.asList(val)), util);
+				}
+			}
+			map.put(issue, new PartsUtilities(Arrays.asList(issue), utilslist));
+		}
+		return map;
+	}
+
+	/**
+	 * 
+	 * @return error string, or null if no error (all parts seem fine)
+	 */
+	private String checkParts() {
+
+		Set<String> collectedIssues = new HashSet<>();
+		for (String partname : partUtilities.keySet()) {
+			PartsUtilities part = partUtilities.get(partname);
+			if (part == null) {
+				return "partUtilities " + partname + " contains null value";
+			}
+			List<String> issues = part.getIssues();
+			HashSet<String> intersection = new HashSet<String>(collectedIssues);
+			intersection.retainAll(issues);
+			if (!intersection.isEmpty()) {
+				return "issues " + intersection + " occur multiple times";
+			}
+			collectedIssues.addAll(issues);
+		}
+
+		if (!collectedIssues.equals(getDomain().getIssues())) {
+			return "parts must cover the domain issues "
+					+ getDomain().getIssues() + " but cover " + collectedIssues;
+		}
+		if (getMaxUtility().compareTo(BigDecimal.ONE) > 0) {
+			return "Max utility of the space exceedds 1";
+		}
+		return null;
+
+	}
+
+	/**
+	 * 
+	 * @return the max possible utility in this utility space.
+	 */
+	private BigDecimal getMaxUtility() {
+		return partUtilities.values().stream()
+				.map(partutils -> partutils.getMaxUtility())
+				.reduce(BigDecimal.ZERO, BigDecimal::add);
+	}
+
+}
Index: /profile/src/test/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilitiesTest.java
===================================================================
--- /profile/src/test/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilitiesTest.java	(revision 8)
+++ /profile/src/test/java/geniusweb/profile/utilityspace/DiscreteValueSetUtilitiesTest.java	(revision 9)
@@ -3,4 +3,5 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -81,8 +82,8 @@
 	@Override
 	public List<String> getGeneralTestStrings() {
-		return Arrays.asList("ValueSetUtilities\\{\"a\"=0.14\\}",
-				"ValueSetUtilities\\{\"b\"=0.37\\}",
-				"ValueSetUtilities\\{\"a\"=0.37\\}",
-				"ValueSetUtilities\\{\"a\"=0.14, \"b\"=0.37\\}");
+		return Arrays.asList("DiscreteValueSetUtilities\\{\"a\"=0.14\\}",
+				"DiscreteValueSetUtilities\\{\"b\"=0.37\\}",
+				"DiscreteValueSetUtilities\\{\"a\"=0.37\\}",
+				"DiscreteValueSetUtilities\\{\"a\"=0.14, \"b\"=0.37\\}");
 	}
 
@@ -200,3 +201,17 @@
 
 	}
+
+	@Test
+	public void testDeserializeAsDiscrete()
+			throws JsonParseException, JsonMappingException, IOException {
+		// Check that DiscreteValueSetUtilities properly deserializes
+		// discreteutils.
+		String utilstring = "{\"discreteutils\": {\"valueUtilities\": {\"Party Tent\": 0.52,\"Your Dorm\": 0.23,\"Party Room\": 0.99,\"Ballroom\": 0.77}}}";
+		DiscreteValueSetUtilities valueutils = jackson.readValue(utilstring,
+				DiscreteValueSetUtilities.class);
+		assertTrue(new BigDecimal("0.23").compareTo(
+				valueutils.getUtility(new DiscreteValue("Your Dorm"))) == 0);
+
+	}
+
 }
Index: /profile/src/test/java/geniusweb/profile/utilityspace/LinearAdditiveTest.java
===================================================================
--- /profile/src/test/java/geniusweb/profile/utilityspace/LinearAdditiveTest.java	(revision 8)
+++ /profile/src/test/java/geniusweb/profile/utilityspace/LinearAdditiveTest.java	(revision 9)
@@ -20,5 +20,4 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 
 import geniusweb.issuevalue.Bid;
@@ -145,8 +144,8 @@
 	public List<String> getGeneralTestStrings() {
 		return Arrays.asList(
-				"LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
-				"LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.7, issue1=0.3\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
-				"LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
-				"LinearAdditive\\[\\{issue2=ValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=ValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value1\"\\}\\]");
+				"LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
+				"LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.8, \"issue2value1\"=0.6\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.3, \"issue1value2\"=0.2\\}\\},\\{issue2=0.7, issue1=0.3\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
+				"LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value2\"\\}\\]",
+				"LinearAdditive\\[\\{issue2=DiscreteValueSetUtilities\\{\"issue2value2\"=0.2, \"issue2value1\"=0.3\\}, issue1=DiscreteValueSetUtilities\\{\"issue1value1\"=0.6, \"issue1value2\"=0.8\\}\\},\\{issue2=0.6, issue1=0.4\\},Bid\\{issue2=\"issue2value1\", issue1=\"issue1value1\"\\}\\]");
 	}
 
@@ -271,5 +270,5 @@
 	}
 
-	@Test(expected = InvalidDefinitionException.class)
+	@Test
 	public void loadFullWithJson() throws IOException {
 		String profile = new String(
Index: /profile/src/test/java/geniusweb/profile/utilityspace/NumberValueSetUtilTest.java
===================================================================
--- /profile/src/test/java/geniusweb/profile/utilityspace/NumberValueSetUtilTest.java	(revision 8)
+++ /profile/src/test/java/geniusweb/profile/utilityspace/NumberValueSetUtilTest.java	(revision 9)
@@ -44,7 +44,7 @@
 	@Override
 	public List<String> getGeneralTestStrings() {
-		return Arrays.asList("NumberValUtility\\(12.5->0.5,18.5->0.9\\)",
-				"NumberValUtility\\(12.5->0.6,18.5->0.9\\)",
-				"NumberValUtility\\(12.5->0.5,18.4->0.9\\)");
+		return Arrays.asList("NumberValueSetUtilities\\(12.5->0.5,18.5->0.9\\)",
+				"NumberValueSetUtilities\\(12.5->0.6,18.5->0.9\\)",
+				"NumberValueSetUtilities\\(12.5->0.5,18.4->0.9\\)");
 	}
 
Index: /profile/src/test/java/geniusweb/profile/utilityspace/PartsUtilitiesTest.java
===================================================================
--- /profile/src/test/java/geniusweb/profile/utilityspace/PartsUtilitiesTest.java	(revision 9)
+++ /profile/src/test/java/geniusweb/profile/utilityspace/PartsUtilitiesTest.java	(revision 9)
@@ -0,0 +1,144 @@
+package geniusweb.profile.utilityspace;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import geniusweb.issuevalue.DiscreteValue;
+import geniusweb.issuevalue.Value;
+import tudelft.utilities.junit.GeneralTests;
+
+public class PartsUtilitiesTest extends GeneralTests<PartsUtilities> {
+	private static final String iss2 = "issue2";
+
+	private static final String iss1 = "issue1";
+
+	private final ObjectMapper jackson = new ObjectMapper();
+
+	private static BigDecimal N01 = new BigDecimal("0.1"),
+			N02 = new BigDecimal("0.2"), N03 = new BigDecimal("0.3"),
+			N05 = new BigDecimal("0.5"), N07 = new BigDecimal("0.7"),
+			N08 = new BigDecimal("0.8"), N09 = new BigDecimal("0.9");
+	private final static DiscreteValue low = new DiscreteValue("low");
+	private final static DiscreteValue high = new DiscreteValue("high");
+
+	private final static String jsontext = "{\"partsutils\":{\"issues\":[\"issue1\",\"issue2\"],\"utilslist\":[{\"values\":[\"low\",\"low\"],\"util\":0.3},{\"values\":[\"high\",\"high\"],\"util\":0.9}]}}";
+
+	private PartsUtilities parts1, parts1a, parts2, parts3;
+
+	@Before
+	public void before() {
+		List<PartUtil> vals = new LinkedList<>();
+		vals.add(new PartUtil(Arrays.asList(low, low), N03));
+		vals.add(new PartUtil(Arrays.asList(high, high), N09));
+		List<PartUtil> vals1 = new LinkedList<>();
+		vals1.add(new PartUtil(Arrays.asList(low, low), N09));
+		List<String> issues = Arrays.asList(iss1, iss2);
+		parts1 = new PartsUtilities(issues, vals);
+		parts1a = new PartsUtilities(issues, vals);
+		parts2 = new PartsUtilities(Arrays.asList(iss1), vals);
+		parts3 = new PartsUtilities(issues, vals1);
+	}
+
+	@Override
+	public List<List<PartsUtilities>> getGeneralTestData() {
+		return Arrays.asList(Arrays.asList(parts1, parts1a),
+				Arrays.asList(parts2), Arrays.asList(parts3));
+	}
+
+	@Override
+	public List<String> getGeneralTestStrings() {
+		return Arrays.asList(
+				"PartsUtilities..issue1, issue2.,\\{.\"low\", \"low\".=0.3, .\"high\", \"high\".=0.9\\}.",
+				"PartsUtilities..issue1.,\\{.\"low\", \"low\".=0.3, .\"high\", \"high\".=0.9\\}.",
+				"PartsUtilities..issue1, issue2.,\\{.\"low\", \"low\".=0.9\\}.");
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testWeightsTooHigh() {
+		Map<ProductOfValue, BigDecimal> utils = new HashMap<>();
+		utils.put(new ProductOfValue(Arrays.asList(low, low)),
+				new BigDecimal("1.1"));
+		new PartsUtilities(Arrays.asList(iss1, iss2), utils);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testWeightsTooLow() {
+		Map<ProductOfValue, BigDecimal> utils = new HashMap<>();
+		utils.put(new ProductOfValue(Arrays.asList(low, low)),
+				new BigDecimal("-0.3"));
+		new PartsUtilities(Arrays.asList(iss1, iss2), utils);
+	}
+
+	@Test
+	public void testBasicSerialize()
+			throws JsonParseException, JsonMappingException, IOException {
+		System.out.println(jsontext);
+		assertEquals(jsontext, jackson.writeValueAsString(parts1));
+	}
+
+	@Test
+	public void testBasicDeserialize()
+			throws JsonParseException, JsonMappingException, IOException {
+		System.out.println(jsontext);
+		assertEquals(parts1, jackson.readValue(jsontext, PartsUtilities.class));
+	}
+
+	@Test
+	public void testGetUtility() {
+		assertEquals(N03,
+				parts1.getUtility(new ProductOfValue(Arrays.asList(low, low))));
+		assertEquals(N09, parts1
+				.getUtility(new ProductOfValue(Arrays.asList(high, high))));
+		assertEquals(BigDecimal.ZERO, parts1
+				.getUtility(new ProductOfValue(Arrays.asList(low, high))));
+	}
+
+	@Test
+	public void testGetIssues() {
+		assertEquals(Arrays.asList(iss1, iss2), parts1.getIssues());
+	}
+
+	@Test
+	public void testGetIncorrectValue() {
+		assertEquals(BigDecimal.ZERO, parts1.getUtility(low));
+	}
+
+	@Test
+	public void testGetValue() {
+		assertTrue(N03.compareTo(parts1
+				.getUtility(new ProductOfValue(Arrays.asList(low, low)))) == 0);
+	}
+
+	@Test
+	public void testMerge() {
+		Map<ProductOfValue, BigDecimal> extravals = new HashMap<>();
+		extravals.put(new ProductOfValue(Arrays.asList(low, low)),
+				N01.multiply(N05));
+		extravals.put(new ProductOfValue(Arrays.asList(high, high)),
+				N01.multiply(N07));
+		PartsUtilities extraparts = new PartsUtilities(
+				Arrays.asList("extra1", "extra2"), extravals);
+
+		PartsUtilities merged = parts1.add(extraparts);
+
+		Value pval = new ProductOfValue(Arrays.asList(low, low, high, high));
+		assertEquals(0,
+				N03.add(N01.multiply(N07)).compareTo(merged.getUtility(pval)));
+	}
+
+}
Index: /profile/src/test/java/geniusweb/profile/utilityspace/ProductOfValueTest.java
===================================================================
--- /profile/src/test/java/geniusweb/profile/utilityspace/ProductOfValueTest.java	(revision 9)
+++ /profile/src/test/java/geniusweb/profile/utilityspace/ProductOfValueTest.java	(revision 9)
@@ -0,0 +1,78 @@
+package geniusweb.profile.utilityspace;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import geniusweb.issuevalue.DiscreteValue;
+import geniusweb.issuevalue.Value;
+import tudelft.utilities.junit.GeneralTests;
+
+public class ProductOfValueTest extends GeneralTests<ProductOfValue> {
+	private final static ObjectMapper jackson = new ObjectMapper();
+
+	private final static Value value1 = new DiscreteValue("val1");
+	private final static Value value2 = new DiscreteValue("val2");
+	private final static ProductOfValue values1 = new ProductOfValue(
+			Arrays.asList(value1, value2));
+	private final static ProductOfValue values1a = new ProductOfValue(
+			Arrays.asList(value1, value2));
+	private final static ProductOfValue values2 = new ProductOfValue(
+			Arrays.asList(value2));
+	private final static DiscreteValue low = new DiscreteValue("low");
+	private final static DiscreteValue high = new DiscreteValue("high");
+
+	private String jsontext = "[\"val1\",\"val2\"]";
+
+	@Override
+	public List<List<ProductOfValue>> getGeneralTestData() {
+		return Arrays.asList(Arrays.asList(values1, values1a),
+				Arrays.asList(values2));
+	}
+
+	@Override
+	public List<String> getGeneralTestStrings() {
+		return Arrays.asList(".*\"val1\", \"val2\".*", ".*\"val2\".*");
+	}
+
+	@Test
+	public void testSerialize()
+			throws JsonParseException, JsonMappingException, IOException {
+
+		assertEquals(jsontext, jackson.writeValueAsString(values1));
+	}
+
+	@Test
+	public void testBasicDeserialize()
+			throws JsonParseException, JsonMappingException, IOException {
+		System.out.println(jsontext);
+		assertEquals(values1,
+				jackson.readValue(jsontext, ProductOfValue.class));
+	}
+
+	@Test
+	public void testMerge() {
+		Value val1 = mock(Value.class);
+		Value val2 = mock(Value.class);
+		Value val3 = mock(Value.class);
+		Value val4 = mock(Value.class);
+
+		ProductOfValue prodOfVal1 = new ProductOfValue(
+				Arrays.asList(val1, val2));
+		ProductOfValue prodOfVal2 = new ProductOfValue(
+				Arrays.asList(val3, val4));
+
+		ProductOfValue prodVal = prodOfVal1.merge(prodOfVal2);
+		assertEquals(4, prodVal.getValues().size());
+	}
+
+}
Index: /profile/src/test/java/geniusweb/profile/utilityspace/SumOfGroupsUtilitySpaceTest.java
===================================================================
--- /profile/src/test/java/geniusweb/profile/utilityspace/SumOfGroupsUtilitySpaceTest.java	(revision 9)
+++ /profile/src/test/java/geniusweb/profile/utilityspace/SumOfGroupsUtilitySpaceTest.java	(revision 9)
@@ -0,0 +1,308 @@
+package geniusweb.profile.utilityspace;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import geniusweb.issuevalue.Bid;
+import geniusweb.issuevalue.DiscreteValue;
+import geniusweb.issuevalue.DiscreteValueSet;
+import geniusweb.issuevalue.Domain;
+import geniusweb.issuevalue.Value;
+import geniusweb.issuevalue.ValueSet;
+import geniusweb.profile.Profile;
+import tudelft.utilities.immutablelist.AbstractImmutableList;
+import tudelft.utilities.immutablelist.ImmutableList;
+import tudelft.utilities.immutablelist.Outer;
+
+public class SumOfGroupsUtilitySpaceTest {
+	private final ObjectMapper jackson = new ObjectMapper();
+	private SumOfGroupsUtilitySpace pa1;
+	private final String iss1 = "issue1", iss2 = "issue2", iss3 = "issue3";
+	private static BigDecimal N01 = new BigDecimal("0.1"),
+			N02 = new BigDecimal("0.2"), N03 = new BigDecimal("0.3"),
+			N05 = new BigDecimal("0.5"), N07 = new BigDecimal("0.7"),
+			N08 = new BigDecimal("0.8"), N09 = new BigDecimal("0.9");
+
+	private final DiscreteValue lo = new DiscreteValue("low");
+	private final DiscreteValue hi = new DiscreteValue("high");
+	private final Bid resBid = new Bid(iss1, hi);
+
+	private Domain domain;
+	private PartsUtilities putils12, putils3;
+	private String serialized = "{\"SumOfGroupsUtilitySpace\":{\"domain\":{\"name\":\"domain\",\"issuesValues\":{\"issue3\":{\"values\":[\"low\",\"high\"]},\"issue2\":{\"values\":[\"low\",\"high\"]},\"issue1\":{\"values\":[\"low\",\"high\"]}}},\"name\":\"testspace\",\"partUtilities\":{\"1and2\":{\"partsutils\":{\"issues\":[\"issue1\",\"issue2\"],\"utilslist\":[{\"values\":[\"low\",\"low\"],\"util\":0.16},{\"values\":[\"high\",\"high\"],\"util\":0.72},{\"values\":[\"low\",\"high\"],\"util\":0.16},{\"values\":[\"high\",\"low\"],\"util\":0.16}]}},\"3\":{\"partsutils\":{\"issues\":[\"issue3\"],\"utilslist\":[{\"values\":[\"low\"],\"util\":0.16},{\"values\":[\"high\"],\"util\":0.14}]}}},\"reservationbid\":{\"issuevalues\":{\"issue1\":\"high\"}}}}";
+
+	@Before
+	public void before() {
+		Map<String, ValueSet> issues = new HashMap<>();
+		issues.put(iss1, new DiscreteValueSet(lo, hi));
+		issues.put(iss2, new DiscreteValueSet(lo, hi));
+		issues.put(iss3, new DiscreteValueSet(lo, hi));
+		domain = new Domain("domain", issues);
+
+		Map<ProductOfValue, BigDecimal> utils12 = new HashMap<>();
+		// util12 has weight N08
+		utils12.put(new ProductOfValue(Arrays.asList(lo, lo)),
+				N02.multiply(N08));
+		utils12.put(new ProductOfValue(Arrays.asList(lo, hi)),
+				N02.multiply(N08));
+		utils12.put(new ProductOfValue(Arrays.asList(hi, lo)),
+				N02.multiply(N08));
+		utils12.put(new ProductOfValue(Arrays.asList(hi, hi)),
+				N09.multiply(N08));
+		putils12 = new PartsUtilities(Arrays.asList(iss1, iss2), utils12);
+
+		// utils3 has weight N02.
+		Map<ProductOfValue, BigDecimal> utils3 = new HashMap<>();
+		utils3.put(new ProductOfValue(Arrays.asList(lo)), N08.multiply(N02));
+		utils3.put(new ProductOfValue(Arrays.asList(hi)), N07.multiply(N02));
+		putils3 = new PartsUtilities(Arrays.asList(iss3), utils3);
+
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void smokeTestIncompleteProfile() {
+		HashMap<String, PartsUtilities> partutils = new HashMap<>();
+		partutils.put("1and2", putils12);
+		new SumOfGroupsUtilitySpace(domain, "testspace", partutils, resBid);
+
+	}
+
+	@Test // non-normalized utils should be fine in this case
+	public void smokeTestWeightsNotNormalized() {
+		HashMap<String, PartsUtilities> partutils = new HashMap<>();
+		partutils.put("1and2", putils12);
+		partutils.put("3", putils3);
+		new SumOfGroupsUtilitySpace(domain, "testspace", partutils, resBid);
+
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void smokeTestExtraIssue() {
+		HashMap<String, PartsUtilities> partutils = new HashMap<>();
+		partutils.put("1and2", putils12);
+		partutils.put("3", putils3);
+		partutils.put("4", putils3);
+		new SumOfGroupsUtilitySpace(domain, "testspace", partutils, resBid);
+
+	}
+
+	@Test
+	public void smokeTest() {
+		makeBasic();
+	}
+
+	@Test
+	public void testName() {
+		SumOfGroupsUtilitySpace paus = makeBasic();
+		assertEquals("testspace", paus.getName());
+	}
+
+	@Test
+	public void testDomain() {
+		SumOfGroupsUtilitySpace paus = makeBasic();
+		assertEquals(domain, paus.getDomain());
+	}
+
+	@Test
+	public void testGetResBid() {
+		SumOfGroupsUtilitySpace paus = makeBasic();
+		assertEquals(resBid, paus.getReservationBid());
+	}
+
+	@Test
+	public void testGetUtilityEmptyBid() {
+		SumOfGroupsUtilitySpace paus = makeBasic();
+		assertTrue(BigDecimal.ZERO.compareTo(
+				paus.getUtility(new Bid(Collections.emptyMap()))) == 0);
+	}
+
+	@Test
+	public void testGetUtility() {
+		SumOfGroupsUtilitySpace paus = makeBasic();
+		Map<String, Value> map = new HashMap<>();
+		map.put(iss1, lo);
+		map.put(iss2, lo); // 1,2 combined has util 0.2
+		map.put(iss3, hi); // 3 has util 0.7
+		// weights are set to 0.8, 0.2. Gives total util 0.3
+		Bid bid = new Bid(map);
+		assertTrue(N03.compareTo(paus.getUtility(bid)) == 0);
+	}
+
+	/**
+	 * Demonstrates how to convert {@link LinearAdditiveUtilitySpace} to a
+	 * {@link SumOfGroupsUtilitySpace}
+	 * 
+	 */
+	@Test
+	public void testConvertLas() throws IOException {
+		String profile = new String(
+				Files.readAllBytes(Paths.get("src/test/resources/party1.json")),
+				StandardCharsets.UTF_8);
+		LinearAdditiveUtilitySpace las = jackson.readValue(profile,
+				LinearAdditiveUtilitySpace.class);
+		SumOfGroupsUtilitySpace pas = new SumOfGroupsUtilitySpace(las);
+		checkUtilitiesAllEqual(las, pas);
+		System.out.println("Generated partial profile:\n" + pas);
+	}
+
+	/**
+	 * Demonstrates how to convert {@link LinearAdditiveUtilitySpace} to a
+	 * {@link SumOfGroupsUtilitySpace} and group some issues
+	 * 
+	 */
+	@Test
+	public void testConvertAndGroupParty() throws IOException {
+		String profile = new String(
+				Files.readAllBytes(Paths.get("src/test/resources/party1.json")),
+				StandardCharsets.UTF_8);
+		LinearAdditiveUtilitySpace las = jackson.readValue(profile,
+				LinearAdditiveUtilitySpace.class);
+		SumOfGroupsUtilitySpace pas = new SumOfGroupsUtilitySpace(las);
+		pas = pas.group(Arrays.asList("Food", "Drinks"), "food&drinks");
+		checkUtilitiesAllEqual(las, pas);
+		System.out.println("Re-grouped party profile:\n");
+		System.out.println(jackson.writeValueAsString(pas));
+
+	}
+
+	@Test
+	public void testGroupe2e() {
+		Map<ProductOfValue, BigDecimal> utils1 = new HashMap<>();
+		utils1.put(new ProductOfValue(Arrays.asList(lo)), N02.multiply(N02));
+		utils1.put(new ProductOfValue(Arrays.asList(hi)), N03.multiply(N02));
+		Map<ProductOfValue, BigDecimal> utils2 = new HashMap<>();
+		utils2.put(new ProductOfValue(Arrays.asList(lo)), N07.multiply(N03));
+		utils2.put(new ProductOfValue(Arrays.asList(hi)), N02.multiply(N03));
+		Map<ProductOfValue, BigDecimal> utils3 = new HashMap<>();
+		utils3.put(new ProductOfValue(Arrays.asList(lo)), N05.multiply(N05));
+		utils3.put(new ProductOfValue(Arrays.asList(hi)), N08.multiply(N05));
+		HashMap<String, PartsUtilities> partutils = new HashMap<>();
+		partutils.put(iss1, new PartsUtilities(Arrays.asList(iss1), utils1));
+		partutils.put(iss2, new PartsUtilities(Arrays.asList(iss2), utils2));
+		partutils.put(iss3, new PartsUtilities(Arrays.asList(iss3), utils3));
+
+		Map<String, ValueSet> issvalues = new HashMap<>();
+		issvalues.put(iss1, new DiscreteValueSet(lo, hi));
+		issvalues.put(iss2, new DiscreteValueSet(lo, hi));
+		issvalues.put(iss3, new DiscreteValueSet(lo, hi));
+		Domain domain1 = new Domain("test", issvalues);
+
+		SumOfGroupsUtilitySpace pas = new SumOfGroupsUtilitySpace(domain1,
+				"testspace", partutils, resBid);
+
+		SumOfGroupsUtilitySpace pasgrouped12 = pas
+				.group(Arrays.asList(iss1, iss2), "iss12");
+
+		checkEqualUtilities(pas, pasgrouped12);
+
+	}
+
+	@Test
+	public void testSerialize() throws JsonProcessingException {
+		SumOfGroupsUtilitySpace paus = makeBasic();
+		ObjectMapper jackson = new ObjectMapper();
+		String string = jackson.writeValueAsString(paus);
+		System.out.println(string);
+		assertEquals(serialized, string);
+
+	}
+
+	@Test
+	public void testDeserialize() throws IOException {
+		ObjectMapper jackson = new ObjectMapper();
+		assertEquals(makeBasic(), jackson.readValue(serialized, Profile.class));
+
+	}
+
+	/************************ PRIVATE FUNCTIONS *******************/
+
+	private void checkEqualUtilities(UtilitySpace space1, UtilitySpace space2) {
+		for (Bid bid : new MyAllBidsList(space1.getDomain())) {
+			assertEquals(space1.getUtility(bid), space2.getUtility(bid));
+		}
+	}
+
+	private SumOfGroupsUtilitySpace makeBasic() {
+		HashMap<String, PartsUtilities> partutils = new HashMap<>();
+		partutils.put("1and2", putils12);
+		partutils.put("3", putils3);
+		return new SumOfGroupsUtilitySpace(domain, "testspace", partutils,
+				resBid);
+
+	}
+
+	private void checkUtilitiesAllEqual(UtilitySpace space1,
+			UtilitySpace space2) {
+		for (Bid bid : new MyAllBidsList(space1.getDomain())) {
+			assertTrue(space1.getUtility(bid)
+					.compareTo(space2.getUtility(bid)) == 0);
+		}
+	}
+
+}
+
+/**
+ * Copy of AllBidsList. We can not depend on BidSpace because that would cause a
+ * cyclic dependency.
+ */
+class MyAllBidsList extends AbstractImmutableList<Bid> {
+
+	private final List<String> issues;
+	private final Outer<? extends Value> allValuePermutations;
+
+	/**
+	 * A list containing all bids in the space. This is an ImmutableList so it
+	 * can contain all bids without pre-computing them.
+	 * 
+	 */
+	public MyAllBidsList(Domain domain) {
+		if (domain == null)
+			throw new IllegalArgumentException("domain=null");
+		issues = new ArrayList<>(domain.getIssues());
+
+		List<ImmutableList<Value>> values = issues.stream()
+				.map(issue -> domain.getValues(issue))
+				.collect(Collectors.toList());
+
+		allValuePermutations = new Outer<Value>(values);
+	}
+
+	@Override
+	public Bid get(BigInteger index) {
+		ImmutableList<? extends Value> nextValues = allValuePermutations
+				.get(index);
+
+		Map<String, Value> issueValues = new HashMap<>();
+		for (int n = 0; n < issues.size(); n++) {
+			issueValues.put(issues.get(n),
+					nextValues.get(BigInteger.valueOf(n)));
+		}
+		return new Bid(issueValues);
+	}
+
+	@Override
+	public BigInteger size() {
+		return allValuePermutations.size();
+	}
+
+}
Index: /profile/src/test/resources/party1.json
===================================================================
--- /profile/src/test/resources/party1.json	(revision 8)
+++ /profile/src/test/resources/party1.json	(revision 9)
@@ -92,5 +92,5 @@
 				"Location": {
 					"values": [
-						"Party Tent'",
+						"Party Tent",
 						"Your Dorm",
 						"Party Room",
Index: /profileconnection/pom.xml
===================================================================
--- /profileconnection/pom.xml	(revision 8)
+++ /profileconnection/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>profileconnection</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -31,5 +31,5 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>profile</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 
Index: /profileconnection/src/main/java/geniusweb/profileconnection/FileProfileConnector.java
===================================================================
--- /profileconnection/src/main/java/geniusweb/profileconnection/FileProfileConnector.java	(revision 8)
+++ /profileconnection/src/main/java/geniusweb/profileconnection/FileProfileConnector.java	(revision 9)
@@ -10,9 +10,11 @@
 
 import geniusweb.profile.Profile;
+import tudelft.utilities.listener.DefaultListenable;
 
 /**
  * ProfileInterface based on a plain filesystem UTF8 file.
  */
-public class FileProfileConnector implements ProfileInterface {
+public class FileProfileConnector extends DefaultListenable<Profile>
+		implements ProfileInterface {
 	private final static ObjectMapper jackson = new ObjectMapper();
 	private final Profile profile;
@@ -25,5 +27,6 @@
 	public FileProfileConnector(String filename) throws IOException {
 		Path path = new File(filename).toPath();
-		String serialized = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+		String serialized = new String(Files.readAllBytes(path),
+				StandardCharsets.UTF_8);
 		profile = jackson.readValue(serialized, Profile.class);
 	}
Index: /profileconnection/src/main/java/geniusweb/profileconnection/ProfileInterface.java
===================================================================
--- /profileconnection/src/main/java/geniusweb/profileconnection/ProfileInterface.java	(revision 8)
+++ /profileconnection/src/main/java/geniusweb/profileconnection/ProfileInterface.java	(revision 9)
@@ -2,9 +2,10 @@
 
 import geniusweb.profile.Profile;
+import tudelft.utilities.listener.Listenable;
 
 /**
  * A container holding a modifyable profile. This interface allows testing.
  */
-public interface ProfileInterface {
+public interface ProfileInterface extends Listenable<Profile> {
 
 	/**
Index: /profileconnection/src/main/java/geniusweb/profileconnection/WebsocketProfileConnector.java
===================================================================
--- /profileconnection/src/main/java/geniusweb/profileconnection/WebsocketProfileConnector.java	(revision 8)
+++ /profileconnection/src/main/java/geniusweb/profileconnection/WebsocketProfileConnector.java	(revision 9)
@@ -15,4 +15,5 @@
 
 import geniusweb.profile.Profile;
+import tudelft.utilities.listener.DefaultListenable;
 import tudelft.utilities.logging.Reporter;
 
@@ -21,5 +22,6 @@
  */
 @ClientEndpoint
-public class WebsocketProfileConnector implements ProfileInterface {
+public class WebsocketProfileConnector extends DefaultListenable<Profile>
+		implements ProfileInterface {
 	private final static ObjectMapper jackson = new ObjectMapper();
 	private static final int TIMEOUT_MS = 2000;
@@ -56,5 +58,6 @@
 		// this will be called every time the profile changes.
 		logger.log(Level.FINE, "Received profile: " + message);
-		this.profile = jackson.readValue(message, Profile.class);
+		profile = jackson.readValue(message, Profile.class);
+		notifyListeners(profile);
 	}
 
Index: /protocol/pom.xml
===================================================================
--- /protocol/pom.xml	(revision 8)
+++ /protocol/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>protocol</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -31,25 +31,20 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>profile</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>geniusweb</groupId>
 			<artifactId>party</artifactId>
-			<version>1.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>tudelft.utilities</groupId>
-			<artifactId>listener</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>geniusweb</groupId>
 			<artifactId>references</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>geniusweb</groupId>
 			<artifactId>events</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
@@ -62,4 +57,9 @@
 			<artifactId>logging</artifactId>
 			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>tudelft.utilities</groupId>
+			<artifactId>listener</artifactId>
+			<version>1.1.0</version>
 		</dependency>
 
@@ -160,5 +160,22 @@
 				</configuration>
 			</plugin>
-
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.0.0-M2</version>
+				<executions>
+					<execution>
+						<id>enforce</id>
+						<configuration>
+							<rules>
+								<dependencyConvergence />
+							</rules>
+						</configuration>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
Index: /protocol/src/main/java/geniusweb/protocol/NegoProtocol.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/NegoProtocol.java	(revision 8)
+++ /protocol/src/main/java/geniusweb/protocol/NegoProtocol.java	(revision 9)
@@ -10,5 +10,5 @@
 import geniusweb.events.CurrentState;
 import geniusweb.events.ProtocolEvent;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
 import geniusweb.protocol.session.SessionSettings;
@@ -70,9 +70,9 @@
 	 * 
 	 * 
-	 * @param connectionfactory the {@link ConnectionWithPartyFactory} that allows
+	 * @param connectionfactory the {@link ProtocolToPartyConnFactory} that allows
 	 *                          the protocol to connect with the {@link Reference}s
 	 *                          in the settings
 	 */
-	void start(ConnectionWithPartyFactory connectionfactory);
+	void start(ProtocolToPartyConnFactory connectionfactory);
 
 	/**
Index: /protocol/src/main/java/geniusweb/protocol/partyconnection/ProtocolToPartyConn.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/partyconnection/ProtocolToPartyConn.java	(revision 9)
+++ /protocol/src/main/java/geniusweb/protocol/partyconnection/ProtocolToPartyConn.java	(revision 9)
@@ -0,0 +1,19 @@
+package geniusweb.protocol.partyconnection;
+
+import geniusweb.actions.Action;
+import geniusweb.actions.PartyId;
+import geniusweb.connection.ConnectionEnd;
+import geniusweb.party.inform.Inform;
+
+/**
+ * Connection of the protocol with a party. Note, this is the opposite direction
+ * of a connection of the party with the protocol.
+ */
+public interface ProtocolToPartyConn extends ConnectionEnd<Action, Inform> {
+
+	/**
+	 * 
+	 * @return the partyId of the party that this connects to
+	 */
+	PartyId getParty();
+}
Index: /protocol/src/main/java/geniusweb/protocol/partyconnection/ProtocolToPartyConnFactory.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/partyconnection/ProtocolToPartyConnFactory.java	(revision 9)
+++ /protocol/src/main/java/geniusweb/protocol/partyconnection/ProtocolToPartyConnFactory.java	(revision 9)
@@ -0,0 +1,39 @@
+package geniusweb.protocol.partyconnection;
+
+import java.io.IOException;
+import java.util.List;
+
+import geniusweb.actions.Action;
+import geniusweb.connection.ConnectionFactory;
+import geniusweb.party.inform.Inform;
+import geniusweb.references.Reference;
+import tudelft.utilities.repository.NoResourcesNowException;
+
+/**
+ * An extended {@link ConnectionFactory} that store PartyIDs with the
+ * connections, making it possible to find back the appropriate connection given
+ * a PartyID. Also, it allows the connection factory to actually assign the
+ * PartyIDs.
+ *
+ */
+public interface ProtocolToPartyConnFactory
+		extends ConnectionFactory<Action, Inform> {
+	@Override
+	public ProtocolToPartyConn connect(Reference reference)
+			throws IOException, NoResourcesNowException;
+
+	/**
+	 * Connects a set of References in one go, following a modified Banker's
+	 * algorthm.
+	 * 
+	 * @param references the list of references to connect with
+	 * @return a List of connections, one fore each Reference.
+	 * @throws IOException             if a connection is failing irrecoverably.
+	 * @throws NoResourcesNowException is there are insufficient resources now.
+	 *                                 This also includes a suggested moment to
+	 *                                 retry.
+	 */
+	List<ProtocolToPartyConn> connect(List<Reference> references)
+			throws IOException, NoResourcesNowException;
+
+}
Index: /protocol/src/main/java/geniusweb/protocol/partyconnection/ProtocolToPartyConnections.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/partyconnection/ProtocolToPartyConnections.java	(revision 9)
+++ /protocol/src/main/java/geniusweb/protocol/partyconnection/ProtocolToPartyConnections.java	(revision 9)
@@ -0,0 +1,123 @@
+package geniusweb.protocol.partyconnection;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import geniusweb.actions.PartyId;
+import geniusweb.party.inform.Inform;
+
+/**
+ * Contains all parties with their connections. immutable
+ */
+public class ProtocolToPartyConnections implements Iterable<ProtocolToPartyConn> {
+	private List<ProtocolToPartyConn> connections;
+
+	public ProtocolToPartyConnections(List<ProtocolToPartyConn> connections) {
+		this.connections = connections;
+	}
+
+	/**
+	 * @param id the {@link PartyId} needed
+	 * @return a connection with that party, or null if no such connection.
+	 */
+	public ProtocolToPartyConn get(PartyId id) {
+		return connections.stream().filter(conn -> id.equals(conn.getParty()))
+				.findAny().orElse(null);
+	}
+
+	/**
+	 * 
+	 * @return true iff all parties have one connection only
+	 */
+	public boolean allunique() {
+		return getParties().size() == connections.size();
+	}
+
+	/**
+	 * 
+	 * @return list of parties currently in the connections.
+	 */
+	private List<PartyId> getParties() {
+		return connections.stream().map(conn -> conn.getParty()).distinct()
+				.collect(Collectors.toList());
+	}
+
+	/**
+	 * Broadcast info to all parties
+	 * 
+	 * @param info the {@link Inform} to broadcast
+	 */
+	public void broadcast(Inform info) throws IOException {
+		for (ProtocolToPartyConn conn : connections) {
+			conn.send(info);
+		}
+	}
+
+	/**
+	 * 
+	 * @return number of connections available
+	 */
+	public int size() {
+		return connections.size();
+	}
+
+	/**
+	 * @param i
+	 * @return the ith connection
+	 */
+	public ProtocolToPartyConn get(int i) {
+		return connections.get(i);
+	}
+
+	public Stream<ProtocolToPartyConn> stream() {
+		return connections.stream();
+	}
+
+	@Override
+	public Iterator<ProtocolToPartyConn> iterator() {
+		return connections.iterator();
+	}
+
+	public ProtocolToPartyConnections with(ProtocolToPartyConn conn) {
+		List<ProtocolToPartyConn> newconnections = new LinkedList<>(
+				connections);
+		newconnections.add(conn);
+		return new ProtocolToPartyConnections(newconnections);
+	}
+
+	@Override
+	public String toString() {
+		return "ConnectionWithParties" + connections;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result
+				+ ((connections == null) ? 0 : connections.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ProtocolToPartyConnections other = (ProtocolToPartyConnections) obj;
+		if (connections == null) {
+			if (other.connections != null)
+				return false;
+		} else if (!connections.equals(other.connections))
+			return false;
+		return true;
+	}
+
+}
Index: /protocol/src/main/java/geniusweb/protocol/session/DefaultSessionState.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/session/DefaultSessionState.java	(revision 8)
+++ /protocol/src/main/java/geniusweb/protocol/session/DefaultSessionState.java	(revision 9)
@@ -10,5 +10,5 @@
 import geniusweb.progress.Progress;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithParties;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
 import geniusweb.references.PartyWithProfile;
 
@@ -19,5 +19,5 @@
 	private final List<Action> actions;
 
-	private final transient ConnectionWithParties connections;
+	private final transient ProtocolToPartyConnections connections;
 
 	private final Progress progress;
@@ -60,5 +60,5 @@
 	 */
 	public DefaultSessionState(List<Action> actions,
-			ConnectionWithParties conns, Progress progr,
+			ProtocolToPartyConnections conns, Progress progr,
 			SessionSettings settings,
 			Map<PartyId, PartyWithProfile> partyprofiles, ProtocolException e) {
@@ -67,5 +67,5 @@
 		}
 		if (conns == null) {
-			this.connections = new ConnectionWithParties(
+			this.connections = new ProtocolToPartyConnections(
 					Collections.EMPTY_LIST);
 		} else {
@@ -92,5 +92,5 @@
 	 * @return existing connections.
 	 */
-	public ConnectionWithParties getConnections() {
+	public ProtocolToPartyConnections getConnections() {
 		return connections;
 	}
Index: /protocol/src/main/java/geniusweb/protocol/session/saop/SAOP.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/session/saop/SAOP.java	(revision 8)
+++ /protocol/src/main/java/geniusweb/protocol/session/saop/SAOP.java	(revision 9)
@@ -23,6 +23,6 @@
 import geniusweb.protocol.CurrentNegoState;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
 import geniusweb.protocol.session.SessionSettings;
@@ -95,5 +95,5 @@
 	@Override
 	public synchronized void start(
-			ConnectionWithPartyFactory connectionfactory) {
+			ProtocolToPartyConnFactory connectionfactory) {
 
 		try {
@@ -151,5 +151,5 @@
 	 */
 	protected synchronized void connect(
-			ConnectionWithPartyFactory connectionfactory)
+			ProtocolToPartyConnFactory connectionfactory)
 			throws InterruptedException, IOException {
 		List<PartyWithProfile> participants = state.getSettings()
@@ -158,5 +158,5 @@
 				.map(parti -> (parti.getParty().getPartyRef()))
 				.collect(Collectors.toList());
-		List<ConnectionWithParty> connections = null;
+		List<ProtocolToPartyConn> connections = null;
 		log.log(Level.INFO, "SAOP connect " + parties);
 		while (connections == null) {
@@ -218,9 +218,9 @@
 	 */
 	protected synchronized void setupParties() throws ProtocolException {
-		for (ConnectionWithParty conn : state.getConnections()) {
+		for (ProtocolToPartyConn conn : state.getConnections()) {
 			conn.addListener(action -> actionRequest(conn, action));
 		}
 
-		for (ConnectionWithParty connection : state.getConnections()) {
+		for (ProtocolToPartyConn connection : state.getConnections()) {
 			try {
 				sendSettings(connection);
@@ -239,5 +239,5 @@
 	 * @throws IOException if party got disconnected
 	 */
-	private synchronized void sendSettings(ConnectionWithParty connection)
+	private synchronized void sendSettings(ProtocolToPartyConn connection)
 			throws IOException {
 		PartyId partyid = connection.getParty();
@@ -261,9 +261,13 @@
 	 */
 	protected synchronized void actionRequest(
-			final ConnectionWithParty partyconn, final Action action) {
+			final ProtocolToPartyConn partyconn, final Action action) {
 		if (action == null) {
-			handleError(partyconn
-					+ " did null action, breaching the protocol. Closing session",
-					partyconn.getParty().getName(), null);
+			Throwable err = partyconn.getError();
+			if (err == null) {
+				err = new ProtocolException("Party sent a null action",
+						partyconn.getParty().getName());
+			}
+			handleError(partyconn + "Protocol error",
+					partyconn.getParty().getName(), err);
 			return;
 		}
@@ -348,11 +352,11 @@
 			return;
 		Inform finished = new Finished(state.getAgreement());
-		for (ConnectionWithParty conn : state.getConnections()) {
+		for (ProtocolToPartyConn conn : state.getConnections()) {
 			sendFinish(conn, finished);
 		}
-		notifyChange(new CurrentNegoState(state));
-	}
-
-	private void sendFinish(ConnectionWithParty connection, Inform finished) {
+		notifyListeners(new CurrentNegoState(state));
+	}
+
+	private void sendFinish(ProtocolToPartyConn connection, Inform finished) {
 		try {
 			connection.send(finished);
Index: /protocol/src/main/java/geniusweb/protocol/session/saop/SAOPState.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/session/saop/SAOPState.java	(revision 8)
+++ /protocol/src/main/java/geniusweb/protocol/session/saop/SAOPState.java	(revision 9)
@@ -16,6 +16,6 @@
 import geniusweb.progress.ProgressRounds;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithParties;
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.session.DefaultSessionState;
 import geniusweb.protocol.session.SessionSettings;
@@ -42,5 +42,5 @@
 	 *                      occurred.
 	 */
-	public SAOPState(List<Action> actions, ConnectionWithParties conns,
+	public SAOPState(List<Action> actions, ProtocolToPartyConnections conns,
 			Progress progress, SessionSettings settings,
 			Map<PartyId, PartyWithProfile> partyprofiles, ProtocolException e) {
@@ -55,5 +55,5 @@
 	public SAOPState(SAOPSettings settings) {
 		this(Collections.emptyList(),
-				new ConnectionWithParties(Collections.emptyList()), null,
+				new ProtocolToPartyConnections(Collections.emptyList()), null,
 				settings, null, null);
 
@@ -82,5 +82,5 @@
 	/**
 	 * 
-	 * @param connection   the new {@link ConnectionWithParty}
+	 * @param connection   the new {@link ProtocolToPartyConn}
 	 * @param partyprofile the {@link PartyWithProfile} that is associated with
 	 *                     this state
@@ -91,8 +91,8 @@
 	 *         state currently indicate if that already happened or not.
 	 */
-	public SAOPState with(ConnectionWithParty connection,
+	public SAOPState with(ProtocolToPartyConn connection,
 			PartyWithProfile partyprofile) {
 		// Only called from the SAOP initialization phase.
-		ConnectionWithParties newconns = getConnections().with(connection);
+		ProtocolToPartyConnections newconns = getConnections().with(connection);
 		Map<PartyId, PartyWithProfile> newprofiles = new HashMap<>(
 				getPartyProfiles());
Index: /protocol/src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsProtocol.java
===================================================================
--- /protocol/src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsProtocol.java	(revision 8)
+++ /protocol/src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsProtocol.java	(revision 9)
@@ -7,5 +7,5 @@
 import geniusweb.protocol.CurrentNegoState;
 import geniusweb.protocol.SessionResult;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
 import geniusweb.protocol.session.SessionSettings;
@@ -29,5 +29,5 @@
 	private final transient Reporter log;
 
-	private ConnectionWithPartyFactory connectionFactory; // FINAL
+	private ProtocolToPartyConnFactory connectionFactory; // FINAL
 	private AllPermutationsState state; // MUTABLE
 
@@ -45,7 +45,7 @@
 
 	@Override
-	public void start(ConnectionWithPartyFactory connectionfactory) {
+	public void start(ProtocolToPartyConnFactory connectionfactory) {
 		this.connectionFactory = connectionfactory;
-		notifyChange(new TournamentStarted(state.getSize().longValue()));
+		notifyListeners(new TournamentStarted(state.getSize().longValue()));
 		startNextSession();
 	}
@@ -85,5 +85,5 @@
 						sessionstate.getAgreement(), sessionstate.getError());
 				state = state.with(result);
-				notifyChange(new CurrentNegoState(state));
+				notifyListeners(new CurrentNegoState(state));
 				if (!state.isFinal(now)) {
 					startNextSession();
Index: /protocol/src/test/java/geniusweb/protocol/session/ConnectionWithPartiesTest.java
===================================================================
--- /protocol/src/test/java/geniusweb/protocol/session/ConnectionWithPartiesTest.java	(revision 8)
+++ /protocol/src/test/java/geniusweb/protocol/session/ConnectionWithPartiesTest.java	(revision 9)
@@ -14,29 +14,29 @@
 
 import geniusweb.actions.PartyId;
-import geniusweb.protocol.partyconnection.ConnectionWithParties;
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import tudelft.utilities.junit.GeneralTests;
 
 public class ConnectionWithPartiesTest
-		extends GeneralTests<ConnectionWithParties> {
+		extends GeneralTests<ProtocolToPartyConnections> {
 	PartyId party1 = new PartyId("party1");
 	PartyId party2 = new PartyId("party2");
 	PartyId party3 = new PartyId("party3");
 
-	private ConnectionWithParty con1 = mock(ConnectionWithParty.class);
-	private ConnectionWithParty con2 = mock(ConnectionWithParty.class);
-	private ConnectionWithParty con3 = mock(ConnectionWithParty.class);
+	private ProtocolToPartyConn con1 = mock(ProtocolToPartyConn.class);
+	private ProtocolToPartyConn con2 = mock(ProtocolToPartyConn.class);
+	private ProtocolToPartyConn con3 = mock(ProtocolToPartyConn.class);
 
-	private ConnectionWithParties conns1 = new ConnectionWithParties(
+	private ProtocolToPartyConnections conns1 = new ProtocolToPartyConnections(
 			Arrays.asList(con1, con2));
-	private ConnectionWithParties conns1a = new ConnectionWithParties(
+	private ProtocolToPartyConnections conns1a = new ProtocolToPartyConnections(
 			Arrays.asList(con1, con2));
-	private ConnectionWithParties conns2 = new ConnectionWithParties(
+	private ProtocolToPartyConnections conns2 = new ProtocolToPartyConnections(
 			Arrays.asList(con1, con3));
-	private ConnectionWithParties conns3 = new ConnectionWithParties(
+	private ProtocolToPartyConnections conns3 = new ProtocolToPartyConnections(
 			Arrays.asList(con2, con1));
-	private ConnectionWithParties conns4 = new ConnectionWithParties(
+	private ProtocolToPartyConnections conns4 = new ProtocolToPartyConnections(
 			Arrays.asList(con2, con1, con3));
-	private ConnectionWithParties conns5 = new ConnectionWithParties(
+	private ProtocolToPartyConnections conns5 = new ProtocolToPartyConnections(
 			Arrays.asList(con2, con1, con3, con1));
 
@@ -54,5 +54,5 @@
 
 	@Override
-	public List<List<ConnectionWithParties>> getGeneralTestData() {
+	public List<List<ProtocolToPartyConnections>> getGeneralTestData() {
 		return Arrays.asList(Arrays.asList(conns1, conns1a),
 				Arrays.asList(conns2), Arrays.asList(conns3),
@@ -98,5 +98,5 @@
 	@Test
 	public void withPartyTest() {
-		ConnectionWithParties conns = conns3.with(con3);
+		ProtocolToPartyConnections conns = conns3.with(con3);
 		assertEquals(2, conns3.size());
 		assertEquals(3, conns.size());
Index: /protocol/src/test/java/geniusweb/protocol/session/DefaultSessionStateTest.java
===================================================================
--- /protocol/src/test/java/geniusweb/protocol/session/DefaultSessionStateTest.java	(revision 8)
+++ /protocol/src/test/java/geniusweb/protocol/session/DefaultSessionStateTest.java	(revision 9)
@@ -27,5 +27,5 @@
 import geniusweb.progress.ProgressTime;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithParties;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
 import geniusweb.protocol.session.saop.SAOPSettings;
 import geniusweb.references.Parameters;
@@ -48,5 +48,5 @@
 		PartyId party1 = new PartyId("party1");
 		actions.add(new EndNegotiation(party1));
-		ConnectionWithParties conns = new ConnectionWithParties(
+		ProtocolToPartyConnections conns = new ProtocolToPartyConnections(
 				Collections.EMPTY_LIST);
 		DeadlineTime deadline = new DeadlineTime(1000);
@@ -126,5 +126,5 @@
 
 	public DefaultSessionState1(List<Action> actions,
-			ConnectionWithParties conns, Progress progr,
+			ProtocolToPartyConnections conns, Progress progr,
 			SessionSettings settings,
 			Map<PartyId, PartyWithProfile> partyprofiles, ProtocolException e) {
Index: /protocol/src/test/java/geniusweb/protocol/session/saop/SAOPStateTest.java
===================================================================
--- /protocol/src/test/java/geniusweb/protocol/session/saop/SAOPStateTest.java	(revision 8)
+++ /protocol/src/test/java/geniusweb/protocol/session/saop/SAOPStateTest.java	(revision 9)
@@ -27,6 +27,6 @@
 import geniusweb.progress.ProgressTime;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithParties;
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.session.SessionSettings;
 import tudelft.utilities.junit.GeneralTests;
@@ -42,13 +42,13 @@
 	private List<Action> actions2 = Arrays.asList(action);
 
-	private ConnectionWithParty party1conn = mock(ConnectionWithParty.class);
-	private ConnectionWithParty party2conn = mock(ConnectionWithParty.class);
-	private ConnectionWithParty party3conn = mock(ConnectionWithParty.class);
-
-	private ConnectionWithParties connections = new ConnectionWithParties(
+	private ProtocolToPartyConn party1conn = mock(ProtocolToPartyConn.class);
+	private ProtocolToPartyConn party2conn = mock(ProtocolToPartyConn.class);
+	private ProtocolToPartyConn party3conn = mock(ProtocolToPartyConn.class);
+
+	private ProtocolToPartyConnections connections = new ProtocolToPartyConnections(
 			Arrays.asList(party1conn, party2conn));
-	private ConnectionWithParties connections2 = new ConnectionWithParties(
+	private ProtocolToPartyConnections connections2 = new ProtocolToPartyConnections(
 			Arrays.asList(party1conn, party3conn));
-	private ConnectionWithParties connections3 = new ConnectionWithParties(
+	private ProtocolToPartyConnections connections3 = new ProtocolToPartyConnections(
 			Arrays.asList(party1conn, party2conn, party3conn));
 
@@ -114,5 +114,5 @@
 	@Test
 	public void constructWith0Connection() {
-		new SAOPState(actions, new ConnectionWithParties(Arrays.asList()),
+		new SAOPState(actions, new ProtocolToPartyConnections(Arrays.asList()),
 				progresstime, settings, null, null);
 	}
@@ -132,5 +132,5 @@
 	@Test
 	public void testNextActor2() {
-		ConnectionWithParties conns = new ConnectionWithParties(
+		ProtocolToPartyConnections conns = new ProtocolToPartyConnections(
 				Arrays.asList(party2conn, party3conn));
 		SAOPState state = new SAOPState(actions, conns, progresstime, settings,
Index: /protocol/src/test/java/geniusweb/protocol/session/saop/SAOPTest.java
===================================================================
--- /protocol/src/test/java/geniusweb/protocol/session/saop/SAOPTest.java	(revision 8)
+++ /protocol/src/test/java/geniusweb/protocol/session/saop/SAOPTest.java	(revision 9)
@@ -39,7 +39,7 @@
 import geniusweb.progress.Progress;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithParties;
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.references.Parameters;
 import geniusweb.references.PartyRef;
@@ -76,14 +76,14 @@
 	private final PartyWithProfile party2 = mock(PartyWithProfile.class);
 	private SAOP saop;
-	private ConnectionWithPartyFactory factory;
+	private ProtocolToPartyConnFactory factory;
 	private List connections;
-	private ConnectionWithParty conn1 = mock(ConnectionWithParty.class),
-			conn2 = mock(ConnectionWithParty.class);
+	private ProtocolToPartyConn conn1 = mock(ProtocolToPartyConn.class),
+			conn2 = mock(ProtocolToPartyConn.class);
 	private Map<PartyId, PartyWithProfile> partyprofiles;
 	private Progress progress = mock(Progress.class);
 	private ProfileRef profile1;
 	private ProfileRef profile2;
-	private ConnectionWithParties connectionswithparties = mock(
-			ConnectionWithParties.class);;
+	private ProtocolToPartyConnections connectionswithparties = mock(
+			ProtocolToPartyConnections.class);;
 	@SuppressWarnings("unchecked")
 	private final Listener<ProtocolEvent> testlistener = mock(Listener.class);
@@ -116,5 +116,5 @@
 		when(settings.getDeadline()).thenReturn(deadlinetime);
 
-		factory = mock(ConnectionWithPartyFactory.class);
+		factory = mock(ProtocolToPartyConnFactory.class);
 		connections = mock(List.class);
 		when(factory.connect(any(List.class))).thenReturn(connections);
@@ -159,5 +159,5 @@
 		when(state.getPartyProfiles()).thenReturn(partyprofiles);
 		when(state.getProgress()).thenReturn(progress);
-		when(state.with(any(ConnectionWithParty.class),
+		when(state.with(any(ProtocolToPartyConn.class),
 				any(PartyWithProfile.class))).thenReturn(connectedstate);
 		when(state.getNextActor()).thenReturn(PARTY1ID);
Index: /protocol/src/test/java/geniusweb/protocol/tournament/AllPermutationsProtocolTest.java
===================================================================
--- /protocol/src/test/java/geniusweb/protocol/tournament/AllPermutationsProtocolTest.java	(revision 8)
+++ /protocol/src/test/java/geniusweb/protocol/tournament/AllPermutationsProtocolTest.java	(revision 9)
@@ -24,5 +24,5 @@
 import geniusweb.protocol.NegoState;
 import geniusweb.protocol.SessionResult;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
 import geniusweb.protocol.session.SessionSettings;
@@ -42,6 +42,6 @@
 	private final AllPermutationsProtocol app = new AllPermutationsProtocol(
 			state, log);
-	private final ConnectionWithPartyFactory factory = mock(
-			ConnectionWithPartyFactory.class);
+	private final ProtocolToPartyConnFactory factory = mock(
+			ProtocolToPartyConnFactory.class);
 	private final SessionSettings settings = mock(SessionSettings.class);
 	private final SessionState finalsessionstate = mock(SessionState.class);
@@ -140,5 +140,5 @@
 
 	@Override
-	public void start(ConnectionWithPartyFactory connectionfactory) {
+	public void start(ProtocolToPartyConnFactory connectionfactory) {
 
 	}
Index: /pythonadapter/pom.xml
===================================================================
--- /pythonadapter/pom.xml	(revision 8)
+++ /pythonadapter/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>pythonadapter</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -31,5 +31,5 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>party</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 
Index: /pythonadapter/src/main/java/geniusweb/pythonadapter/PythonPartyAdapter.java
===================================================================
--- /pythonadapter/src/main/java/geniusweb/pythonadapter/PythonPartyAdapter.java	(revision 8)
+++ /pythonadapter/src/main/java/geniusweb/pythonadapter/PythonPartyAdapter.java	(revision 9)
@@ -7,5 +7,5 @@
 
 import geniusweb.actions.Action;
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.party.Capabilities;
 import geniusweb.party.DefaultParty;
@@ -104,5 +104,5 @@
 
 	@Override
-	public void connect(Connection<Inform, Action> connection) {
+	public void connect(ConnectionEnd<Inform, Action> connection) {
 		pyparty.connect(connection);
 	}
Index: /references/pom.xml
===================================================================
--- /references/pom.xml	(revision 8)
+++ /references/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>references</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -31,5 +31,5 @@
 			<groupId>tudelft.utilities</groupId>
 			<artifactId>listener</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 
Index: /references/src/main/java/geniusweb/connection/Connectable.java
===================================================================
--- /references/src/main/java/geniusweb/connection/Connectable.java	(revision 8)
+++ /references/src/main/java/geniusweb/connection/Connectable.java	(revision 9)
@@ -2,7 +2,8 @@
 
 /**
- * a socket for a general two-way connection
+ * A Connectable is an object that can connect on request with a provided
+ * {@link ConnectionEnd} and then respond to incoming and outgong signals.
  *
- * @param <INTYPE> the type of incoming messages
+ * @param <INTYPE>  the type of incoming messages
  * @param <OUTTYPE> the type of outgoing messages
  */
@@ -13,5 +14,5 @@
 	 * @param connection the new connection
 	 */
-	void connect(Connection<INTYPE, OUTTYPE> connection);
+	void connect(ConnectionEnd<INTYPE, OUTTYPE> connection);
 
 	/**
Index: /references/src/main/java/geniusweb/connection/ConnectionEnd.java
===================================================================
--- /references/src/main/java/geniusweb/connection/ConnectionEnd.java	(revision 9)
+++ /references/src/main/java/geniusweb/connection/ConnectionEnd.java	(revision 9)
@@ -0,0 +1,73 @@
+package geniusweb.connection;
+
+import java.io.IOException;
+import java.net.SocketException;
+import java.net.URI;
+
+import geniusweb.references.Reference;
+import tudelft.utilities.listener.Listenable;
+
+/**
+ * One end of a general two-way connection. incoming data is reported through
+ * the {@link Listenable} channel, sending events of the INTYPE.
+ * <p>
+ * 
+ * The connection mechanism assumed here is fundamentally asymmetric. One side
+ * is "Connectable", the other side is a ConnectionEnd created (usually from a
+ * {@link Reference}. This matches the typical client-server system (web
+ * architecture).
+ * 
+ * <p>
+ * If an internal error occurs, eg a socket failure, timeout, or parser error, a
+ * null event is sent into the Listenable. {@link #getError()} can be called to
+ * find out about the error.
+ *
+ * @param <INTYPE>  the type of incoming messages (incoming for the user of this
+ *                  connection end). Incoming messages are received through
+ *                  Listener#not. Incoming messages are usually asynchronous.
+ * @param <OUTTYPE> the type of outgoing messages (outgoing for the user of this
+ *                  connection end). Outgoing messages can be sent directly with
+ *                  #send.
+ * 
+ */
+public interface ConnectionEnd<INTYPE, OUTTYPE> extends Listenable<INTYPE> {
+
+	/**
+	 * Send data out (and flush the output so that there are no excessive delays
+	 * in sending the data). This call is assumed to return immediately (never
+	 * block, eg on synchronized, Thread.sleep, IO, etc). When this is called
+	 * multiple times in sequence, the data should arrive at the receiver end in
+	 * the same order.
+	 * 
+	 * @param data the data to be sent.
+	 * @throws IOException if the data failed to be sent.
+	 */
+	void send(OUTTYPE data) throws IOException;
+
+	/**
+	 * @return Reference that was used to create this connection
+	 */
+	Reference getReference();
+
+	/**
+	 * @return the URI of the remote endpoint that makes up the connection. This
+	 *         is a URI that uniquely identifies the remote object
+	 */
+	URI getRemoteURI();
+
+	/**
+	 * Close the connection. Should return immediately (not block). Before
+	 * really closing, this should attempt to send out possibly cached messages
+	 * before closing the connection.
+	 * 
+	 */
+	void close();
+
+	/**
+	 * @return the latest internal error, or null if no error occured. If the
+	 *         channel is closed, this is set to {@link SocketException} "Socket
+	 *         closed", even if the close was a "normal" termination eg when
+	 *         {@link #close()} was called.
+	 */
+	Throwable getError();
+}
Index: /references/src/main/java/geniusweb/connection/ConnectionFactory.java
===================================================================
--- /references/src/main/java/geniusweb/connection/ConnectionFactory.java	(revision 8)
+++ /references/src/main/java/geniusweb/connection/ConnectionFactory.java	(revision 9)
@@ -9,4 +9,5 @@
  * factory that can turn a {@link Reference} into a connection to that
  * reference.
+ * 
  * 
  * @param <INTYPE>  the type of incoming messages. Incoming messages are
@@ -30,5 +31,5 @@
 	 *                                 the server. This suggest to retry later.
 	 */
-	Connection<INTYPE, OUTTYPE> connect(Reference reference)
+	ConnectionEnd<INTYPE, OUTTYPE> connect(Reference reference)
 			throws IOException, NoResourcesNowException;
 
Index: /references/src/main/java/geniusweb/connection/DefaultConnection.java
===================================================================
--- /references/src/main/java/geniusweb/connection/DefaultConnection.java	(revision 8)
+++ /references/src/main/java/geniusweb/connection/DefaultConnection.java	(revision 9)
@@ -14,4 +14,4 @@
  */
 public abstract class DefaultConnection<INTYPE, OUTTYPE> extends
-		DefaultListenable<INTYPE> implements Connection<INTYPE, OUTTYPE> {
+		DefaultListenable<INTYPE> implements ConnectionEnd<INTYPE, OUTTYPE> {
 }
Index: /simplerunner/pom.xml
===================================================================
--- /simplerunner/pom.xml	(revision 8)
+++ /simplerunner/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>simplerunner</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -16,5 +16,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
@@ -31,15 +31,16 @@
 			<groupId>geniusweb</groupId>
 			<artifactId>protocol</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>geniusweb</groupId>
 			<artifactId>party</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>geniusweb.exampleparties</groupId>
 			<artifactId>randomparty</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
+			<scope>test</scope>
 		</dependency>
 
@@ -98,5 +99,22 @@
 				</configuration>
 			</plugin>
-
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.0.0-M2</version>
+				<executions>
+					<execution>
+						<id>enforce</id>
+						<configuration>
+							<rules>
+								<dependencyConvergence />
+							</rules>
+						</configuration>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
Index: /simplerunner/src/main/java/geniusweb/simplerunner/BasicConnection.java
===================================================================
--- /simplerunner/src/main/java/geniusweb/simplerunner/BasicConnection.java	(revision 8)
+++ /simplerunner/src/main/java/geniusweb/simplerunner/BasicConnection.java	(revision 9)
@@ -4,5 +4,5 @@
 import java.net.URI;
 
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.references.Reference;
 import tudelft.utilities.listener.DefaultListenable;
@@ -17,5 +17,5 @@
  */
 public class BasicConnection<IN, OUT> extends DefaultListenable<IN>
-		implements Connection<IN, OUT> {
+		implements ConnectionEnd<IN, OUT> {
 	private final Reference reference;
 	private final URI uri;
Index: /simplerunner/src/main/java/geniusweb/simplerunner/ClassPathConnectionFactory.java
===================================================================
--- /simplerunner/src/main/java/geniusweb/simplerunner/ClassPathConnectionFactory.java	(revision 8)
+++ /simplerunner/src/main/java/geniusweb/simplerunner/ClassPathConnectionFactory.java	(revision 9)
@@ -13,6 +13,6 @@
 import geniusweb.party.Party;
 import geniusweb.party.inform.Inform;
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.references.Reference;
 import tudelft.utilities.repository.NoResourcesNowException;
@@ -25,5 +25,5 @@
  *
  */
-public class ClassPathConnectionFactory implements ConnectionWithPartyFactory {
+public class ClassPathConnectionFactory implements ProtocolToPartyConnFactory {
 	private static final String SCHEME = "classpath";
 	private static int serialcounter = 1;
@@ -31,5 +31,5 @@
 
 	@Override
-	public ConnectionWithParty connect(Reference reference) {
+	public ProtocolToPartyConn connect(Reference reference) {
 		// set up the whole other party including the connection to it.
 		String classpath = getClassPath(reference.getURI());
@@ -42,6 +42,6 @@
 				uri("classpath:" + reference.getURI().getSchemeSpecificPart()
 						+ "." + (serialcounter++)));
-		party2protocol.init(action -> protocol2party.notifyChange(action));
-		protocol2party.init(info -> party2protocol.notifyChange(info));
+		party2protocol.init(action -> protocol2party.notifyListeners(action));
+		protocol2party.init(info -> party2protocol.notifyListeners(info));
 
 		party.connect(party2protocol);
@@ -102,7 +102,7 @@
 
 	@Override
-	public List<ConnectionWithParty> connect(List<Reference> references)
+	public List<ProtocolToPartyConn> connect(List<Reference> references)
 			throws IOException, NoResourcesNowException {
-		List<ConnectionWithParty> connections = new LinkedList<>();
+		List<ProtocolToPartyConn> connections = new LinkedList<>();
 		for (Reference partyref : references) {
 			connections.add(connect(partyref));
@@ -114,5 +114,5 @@
 
 class BasicConnectionWithParty extends BasicConnection<Action, Inform>
-		implements ConnectionWithParty {
+		implements ProtocolToPartyConn {
 
 	private PartyId id;
Index: /simplerunner/src/main/java/geniusweb/simplerunner/NegoRunner.java
===================================================================
--- /simplerunner/src/main/java/geniusweb/simplerunner/NegoRunner.java	(revision 8)
+++ /simplerunner/src/main/java/geniusweb/simplerunner/NegoRunner.java	(revision 9)
@@ -13,5 +13,5 @@
 import geniusweb.protocol.NegoProtocol;
 import geniusweb.protocol.NegoSettings;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionSettings;
 import tudelft.utilities.logging.ReportToLogger;
@@ -27,10 +27,10 @@
 	private final NegoSettings settings;
 	private final NegoProtocol protocol;
-	private final ConnectionWithPartyFactory connectionfactory;
+	private final ProtocolToPartyConnFactory connectionfactory;
 	private final Reporter log;
 	private final static ObjectMapper jackson = new ObjectMapper();
 
 	public NegoRunner(NegoSettings settings,
-			ConnectionWithPartyFactory connectionfactory, Reporter logger) {
+			ProtocolToPartyConnFactory connectionfactory, Reporter logger) {
 		if (settings == null || connectionfactory == null) {
 			throw new NullPointerException("Arguments must be not null");
Index: /simplerunner/src/test/java/geniusweb/simplerunner/ClassPathConnectionFactoryTest.java
===================================================================
--- /simplerunner/src/test/java/geniusweb/simplerunner/ClassPathConnectionFactoryTest.java	(revision 8)
+++ /simplerunner/src/test/java/geniusweb/simplerunner/ClassPathConnectionFactoryTest.java	(revision 9)
@@ -10,5 +10,5 @@
 
 import geniusweb.actions.Action;
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.party.inform.Inform;
 import geniusweb.references.PartyRef;
@@ -42,5 +42,5 @@
 	@Test
 	public void testRandomParty() throws IOException, URISyntaxException {
-		Connection<Action, Inform> party = factory.connect(new PartyRef(
+		ConnectionEnd<Action, Inform> party = factory.connect(new PartyRef(
 				"classpath:geniusweb.exampleparties.randomparty.RandomParty"));
 		assertNotNull(party);
Index: /simplerunner/src/test/java/geniusweb/simplerunner/SessionRunnerTest.java
===================================================================
--- /simplerunner/src/test/java/geniusweb/simplerunner/SessionRunnerTest.java	(revision 8)
+++ /simplerunner/src/test/java/geniusweb/simplerunner/SessionRunnerTest.java	(revision 9)
@@ -18,5 +18,5 @@
 import geniusweb.protocol.CurrentNegoState;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
 import geniusweb.protocol.session.SessionSettings;
@@ -47,5 +47,5 @@
 	public void smokeTest() {
 		new NegoRunner(mock(SessionSettings.class),
-				mock(ConnectionWithPartyFactory.class), logger);
+				mock(ProtocolToPartyConnFactory.class), logger);
 	}
 
@@ -56,6 +56,6 @@
 		when(settings.getProtocol(logger)).thenReturn(protocol);
 		@SuppressWarnings("unchecked")
-		ConnectionWithPartyFactory factory = mock(
-				ConnectionWithPartyFactory.class);
+		ProtocolToPartyConnFactory factory = mock(
+				ProtocolToPartyConnFactory.class);
 
 		NegoRunner runner = spy(
@@ -80,6 +80,6 @@
 		Reporter logger = mock(Reporter.class);
 		@SuppressWarnings("unchecked")
-		ConnectionWithPartyFactory factory = mock(
-				ConnectionWithPartyFactory.class);
+		ProtocolToPartyConnFactory factory = mock(
+				ProtocolToPartyConnFactory.class);
 		NegoRunner runner = spy(
 				new NegoRunner(settings, factory, logger));
@@ -107,6 +107,6 @@
 		when(protocol.getState()).thenReturn(state);
 		@SuppressWarnings("unchecked")
-		ConnectionWithPartyFactory factory = mock(
-				ConnectionWithPartyFactory.class);
+		ProtocolToPartyConnFactory factory = mock(
+				ProtocolToPartyConnFactory.class);
 		NegoRunner runner = spy(
 				new NegoRunner(settings, factory, logger));
Index: /timeline/pom.xml
===================================================================
--- /timeline/pom.xml	(revision 8)
+++ /timeline/pom.xml	(revision 9)
@@ -6,5 +6,5 @@
 	<groupId>geniusweb</groupId>
 	<artifactId>timeline</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<packaging>jar</packaging>
 
@@ -15,5 +15,5 @@
 		<basedir>.</basedir>
 		<passwd>${env.ARTIFACTORY_PASS}</passwd>
-		<jackson-2-version>2.9.6</jackson-2-version>
+		<jackson-2-version>2.9.10</jackson-2-version>
 	</properties>
 
