Code maintenace and changes

11 files changed, 436 insertions, 415 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazy.java b/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazy.java
new file mode 100644
index 0000000..dda65a7
--- /dev/null
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazy.java
@@ -0,0 +1,99 @@
+package bjc.utils.data;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
+
+import bjc.utils.funcdata.FunctionalList;
+import bjc.utils.funcdata.IFunctionalList;
+
+class BoundLazy<OldType, BoundContainedType>
+		implements IHolder<BoundContainedType> {
+	private Supplier<IHolder<OldType>>							oldSupplier;
+
+	private Function<OldType, IHolder<BoundContainedType>>		binder;
+
+	private IHolder<BoundContainedType>							boundHolder;
+
+	private boolean												holderBound;
+
+	private IFunctionalList<UnaryOperator<BoundContainedType>>	actions	= new FunctionalList<>();
+
+	public BoundLazy(Supplier<IHolder<OldType>> supp,
+			Function<OldType, IHolder<BoundContainedType>> binder) {
+		oldSupplier = supp;
+		this.binder = binder;
+	}
+
+	@Override
+	public <BoundType> IHolder<BoundType> bind(
+			Function<BoundContainedType, IHolder<BoundType>> bindr) {
+		IFunctionalList<UnaryOperator<BoundContainedType>> pendingActions = new FunctionalList<>();
+
+		actions.forEach(pendingActions::add);
+
+		Supplier<IHolder<BoundContainedType>> typeSupplier = () -> {
+			IHolder<BoundContainedType> oldHolder = boundHolder;
+
+			if (!holderBound) {
+				oldHolder = oldSupplier.get().unwrap(binder);
+			}
+
+			return pendingActions.reduceAux(oldHolder, (action, state) -> {
+				return state.transform(action);
+			}, (value) -> value);
+		};
+
+		return new BoundLazy<>(typeSupplier, bindr);
+	}
+
+	@Override
+	public <MappedType> IHolder<MappedType> map(
+			Function<BoundContainedType, MappedType> mapper) {
+		IFunctionalList<UnaryOperator<BoundContainedType>> pendingActions = new FunctionalList<>();
+
+		actions.forEach(pendingActions::add);
+
+		Supplier<MappedType> typeSupplier = () -> {
+			IHolder<BoundContainedType> oldHolder = boundHolder;
+
+			if (!holderBound) {
+				oldHolder = oldSupplier.get().unwrap(binder);
+			}
+
+			return pendingActions.reduceAux(oldHolder.getValue(),
+					(action, state) -> {
+						return action.apply(state);
+					}, (value) -> mapper.apply(value));
+		};
+
+		return new Lazy<>(typeSupplier);
+	}
+
+	@Override
+	public IHolder<BoundContainedType> transform(
+			UnaryOperator<BoundContainedType> transformer) {
+		actions.add(transformer);
+
+		return this;
+	}
+
+	@Override
+	public <UnwrappedType> UnwrappedType unwrap(
+			Function<BoundContainedType, UnwrappedType> unwrapper) {
+		if (!holderBound) {
+			boundHolder = oldSupplier.get().unwrap(binder::apply);
+		}
+
+		return boundHolder.unwrap(unwrapper);
+	}
+
+	@Override
+	public String toString() {
+		if (holderBound) {
+			return boundHolder.toString();
+		}
+
+		return "(unmaterialized)";
+	}
+}
\ No newline at end of file
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazyPair.java
new file mode 100644
index 0000000..41ab99b
--- /dev/null
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazyPair.java
@@ -0,0 +1,104 @@
+package bjc.utils.data;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight>
+		implements IPair<NewLeft, NewRight> {
+	private Supplier<OldLeft>										leftSupplier;
+	private Supplier<OldRight>										rightSupplier;
+
+	private BiFunction<OldLeft, OldRight, IPair<NewLeft, NewRight>>	binder;
+
+	private IPair<NewLeft, NewRight>								boundPair;
+
+	private boolean													pairBound;
+
+	public BoundLazyPair(Supplier<OldLeft> leftSupp,
+			Supplier<OldRight> rightSupp,
+			BiFunction<OldLeft, OldRight, IPair<NewLeft, NewRight>> bindr) {
+		leftSupplier = leftSupp;
+		rightSupplier = rightSupp;
+		binder = bindr;
+	}
+
+	@Override
+	public <BoundLeft> IPair<BoundLeft, NewRight> bindLeft(
+			Function<NewLeft, IPair<BoundLeft, NewRight>> leftBinder) {
+		Supplier<NewLeft> leftSupp = () -> {
+			IPair<NewLeft, NewRight> newPair = boundPair;
+
+			if (!pairBound) {
+				newPair = binder.apply(leftSupplier.get(),
+						rightSupplier.get());
+			}
+
+			return newPair.getLeft();
+		};
+
+		return new HalfBoundLazyPair<>(leftSupp, leftBinder);
+	}
+
+	@Override
+	public <BoundRight> IPair<NewLeft, BoundRight> bindRight(
+			Function<NewRight, IPair<NewLeft, BoundRight>> rightBinder) {
+		Supplier<NewRight> rightSupp = () -> {
+			IPair<NewLeft, NewRight> newPair = boundPair;
+
+			if (!pairBound) {
+				newPair = binder.apply(leftSupplier.get(),
+						rightSupplier.get());
+			}
+
+			return newPair.getRight();
+		};
+
+		return new HalfBoundLazyPair<>(rightSupp, rightBinder);
+	}
+
+	@Override
+	public <BoundLeft, BoundRight> IPair<BoundLeft, BoundRight> bind(
+			BiFunction<NewLeft, NewRight, IPair<BoundLeft, BoundRight>> bindr) {
+		IHolder<IPair<NewLeft, NewRight>> newPair = new Identity<>(
+				boundPair);
+		IHolder<Boolean> newPairMade = new Identity<>(pairBound);
+
+		Supplier<NewLeft> leftSupp = () -> {
+			if (!newPairMade.getValue()) {
+				newPair.replace(binder.apply(leftSupplier.get(),
+						rightSupplier.get()));
+
+				newPairMade.replace(false);
+			}
+
+			return newPair.unwrap((pair) -> pair.getLeft());
+		};
+
+		Supplier<NewRight> rightSupp = () -> {
+			if (!newPairMade.getValue()) {
+				newPair.replace(binder.apply(leftSupplier.get(),
+						rightSupplier.get()));
+
+				newPairMade.replace(false);
+			}
+
+			return newPair.unwrap((pair) -> pair.getRight());
+		};
+
+		return new BoundLazyPair<>(leftSupp, rightSupp, bindr);
+	}
+
+	@Override
+	public <MergedType> MergedType merge(
+			BiFunction<NewLeft, NewRight, MergedType> merger) {
+		if (!pairBound) {
+			boundPair = binder.apply(leftSupplier.get(),
+					rightSupplier.get());
+
+			pairBound = true;
+		}
+
+		return boundPair.merge(merger);
+	}
+}
\ No newline at end of file
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/HalfBoundLazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/HalfBoundLazyPair.java
new file mode 100644
index 0000000..f32f58f
--- /dev/null
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/HalfBoundLazyPair.java
@@ -0,0 +1,93 @@
+package bjc.utils.data;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+class HalfBoundLazyPair<OldType, NewLeft, NewRight>
+		implements IPair<NewLeft, NewRight> {
+	private Supplier<OldType>							oldSupplier;
+
+	private Function<OldType, IPair<NewLeft, NewRight>>	binder;
+
+	private IPair<NewLeft, NewRight>					boundPair;
+	private boolean										pairBound;
+
+	public HalfBoundLazyPair(Supplier<OldType> oldSupp,
+			Function<OldType, IPair<NewLeft, NewRight>> bindr) {
+		oldSupplier = oldSupp;
+		binder = bindr;
+	}
+
+	@Override
+	public <BoundLeft> IPair<BoundLeft, NewRight> bindLeft(
+			Function<NewLeft, IPair<BoundLeft, NewRight>> leftBinder) {
+		Supplier<NewLeft> leftSupp = () -> {
+			IPair<NewLeft, NewRight> newPair = boundPair;
+
+			if (!pairBound) {
+				newPair = binder.apply(oldSupplier.get());
+			}
+
+			return newPair.getLeft();
+		};
+
+		return new HalfBoundLazyPair<>(leftSupp, leftBinder);
+	}
+
+	@Override
+	public <BoundRight> IPair<NewLeft, BoundRight> bindRight(
+			Function<NewRight, IPair<NewLeft, BoundRight>> rightBinder) {
+		Supplier<NewRight> rightSupp = () -> {
+			IPair<NewLeft, NewRight> newPair = boundPair;
+
+			if (!pairBound) {
+				newPair = binder.apply(oldSupplier.get());
+			}
+
+			return newPair.getRight();
+		};
+
+		return new HalfBoundLazyPair<>(rightSupp, rightBinder);
+	}
+
+	@Override
+	public <BoundLeft, BoundRight> IPair<BoundLeft, BoundRight> bind(
+			BiFunction<NewLeft, NewRight, IPair<BoundLeft, BoundRight>> bindr) {
+		IHolder<IPair<NewLeft, NewRight>> newPair = new Identity<>(
+				boundPair);
+		IHolder<Boolean> newPairMade = new Identity<>(pairBound);
+
+		Supplier<NewLeft> leftSupp = () -> {
+			if (!newPairMade.getValue()) {
+				newPair.replace(binder.apply(oldSupplier.get()));
+				newPairMade.replace(true);
+			}
+
+			return newPair.unwrap((pair) -> pair.getLeft());
+		};
+
+		Supplier<NewRight> rightSupp = () -> {
+			if (!newPairMade.getValue()) {
+				newPair.replace(binder.apply(oldSupplier.get()));
+				newPairMade.replace(true);
+			}
+
+			return newPair.unwrap((pair) -> pair.getRight());
+		};
+
+		return new BoundLazyPair<>(leftSupp, rightSupp, bindr);
+	}
+
+	@Override
+	public <MergedType> MergedType merge(
+			BiFunction<NewLeft, NewRight, MergedType> merger) {
+		if (!pairBound) {
+			boundPair = binder.apply(oldSupplier.get());
+
+			pairBound = true;
+		}
+
+		return boundPair.merge(merger);
+	}
+}
\ No newline at end of file
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/IHolder.java b/BJC-Utils2/src/main/java/bjc/utils/data/IHolder.java
index 6ccf115..77eb899 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/IHolder.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/IHolder.java
@@ -1,4 +1,4 @@
-package bjc.utils.data.experimental;
+package bjc.utils.data;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/IPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/IPair.java
index f5ca240..3d4998c 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/IPair.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/IPair.java
@@ -1,4 +1,4 @@
-package bjc.utils.data.experimental;
+package bjc.utils.data;
 
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/Identity.java b/BJC-Utils2/src/main/java/bjc/utils/data/Identity.java
index 1780f2d..dcc7bef 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/Identity.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Identity.java
@@ -1,4 +1,4 @@
-package bjc.utils.data.experimental;
+package bjc.utils.data;
 
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/Lazy.java b/BJC-Utils2/src/main/java/bjc/utils/data/Lazy.java
index 0d6fcef..f4bc24a 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/Lazy.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Lazy.java
@@ -1,4 +1,4 @@
-package bjc.utils.data.experimental;
+package bjc.utils.data;
 
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -16,98 +16,6 @@ import bjc.utils.funcdata.IFunctionalList;
  * @param <ContainedType>
  */
 public class Lazy<ContainedType> implements IHolder<ContainedType> {
-	private static class BoundLazy<OldType, BoundContainedType>
-			implements IHolder<BoundContainedType> {
-		private Supplier<IHolder<OldType>>							oldSupplier;
-
-		private Function<OldType, IHolder<BoundContainedType>>		binder;
-
-		private IHolder<BoundContainedType>							boundHolder;
-
-		private boolean												holderBound;
-
-		private IFunctionalList<UnaryOperator<BoundContainedType>>	actions	= new FunctionalList<>();
-
-		public BoundLazy(Supplier<IHolder<OldType>> supp,
-				Function<OldType, IHolder<BoundContainedType>> binder) {
-			oldSupplier = supp;
-			this.binder = binder;
-		}
-
-		@Override
-		public <BoundType> IHolder<BoundType> bind(
-				Function<BoundContainedType, IHolder<BoundType>> bindr) {
-			IFunctionalList<UnaryOperator<BoundContainedType>> pendingActions = new FunctionalList<>();
-
-			actions.forEach(pendingActions::add);
-
-			Supplier<IHolder<BoundContainedType>> typeSupplier = () -> {
-				IHolder<BoundContainedType> oldHolder = boundHolder;
-
-				if (!holderBound) {
-					oldHolder = oldSupplier.get().unwrap(binder);
-				}
-
-				return pendingActions.reduceAux(oldHolder,
-						(action, state) -> {
-							return state.transform(action);
-						}, (value) -> value);
-			};
-
-			return new BoundLazy<>(typeSupplier, bindr);
-		}
-
-		@Override
-		public <MappedType> IHolder<MappedType> map(
-				Function<BoundContainedType, MappedType> mapper) {
-			IFunctionalList<UnaryOperator<BoundContainedType>> pendingActions = new FunctionalList<>();
-
-			actions.forEach(pendingActions::add);
-
-			Supplier<MappedType> typeSupplier = () -> {
-				IHolder<BoundContainedType> oldHolder = boundHolder;
-
-				if (!holderBound) {
-					oldHolder = oldSupplier.get().unwrap(binder);
-				}
-
-				return pendingActions.reduceAux(oldHolder.getValue(),
-						(action, state) -> {
-							return action.apply(state);
-						}, (value) -> mapper.apply(value));
-			};
-
-			return new Lazy<>(typeSupplier);
-		}
-
-		@Override
-		public IHolder<BoundContainedType> transform(
-				UnaryOperator<BoundContainedType> transformer) {
-			actions.add(transformer);
-
-			return this;
-		}
-
-		@Override
-		public <UnwrappedType> UnwrappedType unwrap(
-				Function<BoundContainedType, UnwrappedType> unwrapper) {
-			if (!holderBound) {
-				boundHolder = oldSupplier.get().unwrap(binder::apply);
-			}
-
-			return boundHolder.unwrap(unwrapper);
-		}
-
-		@Override
-		public String toString() {
-			if (holderBound) {
-				return boundHolder.toString();
-			}
-
-			return "(unmaterialized)";
-		}
-	}
-
 	private Supplier<ContainedType>							valueSupplier;
 
 	private IFunctionalList<UnaryOperator<ContainedType>>	actions	= new FunctionalList<>();
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java
new file mode 100644
index 0000000..fd432c1
--- /dev/null
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java
@@ -0,0 +1,134 @@
+package bjc.utils.data;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * A lazy implementation of a pair
+ * 
+ * @author ben
+ *
+ * @param <LeftType>
+ *            The type on the left side of the pair
+ * @param <RightType>
+ *            The type on the right side of the pair
+ */
+public class LazyPair<LeftType, RightType>
+		implements IPair<LeftType, RightType> {
+	private LeftType			leftValue;
+	private RightType			rightValue;
+
+	private Supplier<LeftType>	leftSupplier;
+	private Supplier<RightType>	rightSupplier;
+
+	private boolean				leftMaterialized;
+	private boolean				rightMaterialized;
+
+	/**
+	 * Create a new lazy pair, using the set value s
+	 * 
+	 * @param leftVal
+	 *            The value for the left side of the pair
+	 * @param rightVal
+	 *            The value for the right side of the pair
+	 */
+	public LazyPair(LeftType leftVal, RightType rightVal) {
+		leftValue = leftVal;
+		rightValue = rightVal;
+
+		leftMaterialized = true;
+		rightMaterialized = true;
+	}
+
+	/**
+	 * Create a new lazy pair from the given value sources
+	 * 
+	 * @param leftSupp
+	 *            The source for a value on the left side of the pair
+	 * @param rightSupp
+	 *            The source for a value on the right side of the pair
+	 */
+	public LazyPair(Supplier<LeftType> leftSupp,
+			Supplier<RightType> rightSupp) {
+		leftSupplier = leftSupp;
+		rightSupplier = rightSupp;
+
+		leftMaterialized = false;
+		rightMaterialized = false;
+	}
+
+	@Override
+	public <BoundLeft> IPair<BoundLeft, RightType> bindLeft(
+			Function<LeftType, IPair<BoundLeft, RightType>> leftBinder) {
+		Supplier<LeftType> leftSupp = () -> {
+			if (leftMaterialized) {
+				return leftValue;
+			}
+
+			return leftSupplier.get();
+		};
+
+		return new HalfBoundLazyPair<>(leftSupp, leftBinder);
+	}
+
+	@Override
+	public <BoundRight> IPair<LeftType, BoundRight> bindRight(
+			Function<RightType, IPair<LeftType, BoundRight>> rightBinder) {
+		Supplier<RightType> rightSupp = () -> {
+			if (rightMaterialized) {
+				return rightValue;
+			}
+
+			return rightSupplier.get();
+		};
+
+		return new HalfBoundLazyPair<>(rightSupp, rightBinder);
+	}
+
+	@Override
+	public <BoundLeft, BoundRight> IPair<BoundLeft, BoundRight> bind(
+			BiFunction<LeftType, RightType, IPair<BoundLeft, BoundRight>> binder) {
+		return new BoundLazyPair<>(leftSupplier, rightSupplier, binder);
+	}
+
+	@Override
+	public <MergedType> MergedType merge(
+			BiFunction<LeftType, RightType, MergedType> merger) {
+		if (!leftMaterialized) {
+			leftValue = leftSupplier.get();
+
+			leftMaterialized = true;
+		}
+
+		if (!rightMaterialized) {
+			rightValue = rightSupplier.get();
+
+			rightMaterialized = true;
+		}
+
+		return merger.apply(leftValue, rightValue);
+	}
+
+	@Override
+	public LeftType getLeft() {
+		if (!leftMaterialized) {
+			leftValue = leftSupplier.get();
+
+			leftMaterialized = true;
+		}
+
+		return leftValue;
+	}
+
+	@Override
+	public RightType getRight() {
+		if (!rightMaterialized) {
+			rightValue = rightSupplier.get();
+
+			rightMaterialized = true;
+		}
+
+		return rightValue;
+	}
+}
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/Pair.java b/BJC-Utils2/src/main/java/bjc/utils/data/Pair.java
index 87378d7..958df40 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/Pair.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Pair.java
@@ -1,4 +1,4 @@
-package bjc.utils.data.experimental;
+package bjc.utils.data;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/LazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/experimental/LazyPair.java
deleted file mode 100644
index 04a4b61..0000000
--- a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/LazyPair.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package bjc.utils.data.experimental;
-
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-/**
- * A lazy implementation of a pair
- * 
- * @author ben
- *
- * @param <LeftType>
- *            The type on the left side of the pair
- * @param <RightType>
- *            The type on the right side of the pair
- */
-public class LazyPair<LeftType, RightType>
-		implements IPair<LeftType, RightType> {
-	private static class HalfBoundLazyPair<OldType, NewLeft, NewRight>
-			implements IPair<NewLeft, NewRight> {
-		private Supplier<OldType>							oldSupplier;
-
-		private Function<OldType, IPair<NewLeft, NewRight>>	binder;
-
-		private IPair<NewLeft, NewRight>					boundPair;
-		private boolean										pairBound;
-
-		public HalfBoundLazyPair(Supplier<OldType> oldSupp,
-				Function<OldType, IPair<NewLeft, NewRight>> bindr) {
-			oldSupplier = oldSupp;
-			binder = bindr;
-		}
-
-		@Override
-		public <BoundLeft> IPair<BoundLeft, NewRight> bindLeft(
-				Function<NewLeft, IPair<BoundLeft, NewRight>> leftBinder) {
-			Supplier<NewLeft> leftSupp = () -> {
-				IPair<NewLeft, NewRight> newPair = boundPair;
-
-				if (!pairBound) {
-					newPair = binder.apply(oldSupplier.get());
-				}
-
-				return newPair.getLeft();
-			};
-
-			return new HalfBoundLazyPair<>(leftSupp, leftBinder);
-		}
-
-		@Override
-		public <BoundRight> IPair<NewLeft, BoundRight> bindRight(
-				Function<NewRight, IPair<NewLeft, BoundRight>> rightBinder) {
-			Supplier<NewRight> rightSupp = () -> {
-				IPair<NewLeft, NewRight> newPair = boundPair;
-
-				if (!pairBound) {
-					newPair = binder.apply(oldSupplier.get());
-				}
-
-				return newPair.getRight();
-			};
-
-			return new HalfBoundLazyPair<>(rightSupp, rightBinder);
-		}
-
-		@Override
-		public <BoundLeft, BoundRight> IPair<BoundLeft, BoundRight> bind(
-				BiFunction<NewLeft, NewRight, IPair<BoundLeft, BoundRight>> bindr) {
-			IHolder<IPair<NewLeft, NewRight>> newPair = new Identity<>(
-					boundPair);
-			IHolder<Boolean> newPairMade = new Identity<>(pairBound);
-
-			Supplier<NewLeft> leftSupp = () -> {
-				if (!newPairMade.getValue()) {
-					newPair.replace(binder.apply(oldSupplier.get()));
-					newPairMade.replace(true);
-				}
-
-				return newPair.unwrap((pair) -> pair.getLeft());
-			};
-
-			Supplier<NewRight> rightSupp = () -> {
-				if (!newPairMade.getValue()) {
-					newPair.replace(binder.apply(oldSupplier.get()));
-					newPairMade.replace(true);
-				}
-
-				return newPair.unwrap((pair) -> pair.getRight());
-			};
-
-			return new BoundLazyPair<>(leftSupp, rightSupp, bindr);
-		}
-
-		@Override
-		public <MergedType> MergedType merge(
-				BiFunction<NewLeft, NewRight, MergedType> merger) {
-			if (!pairBound) {
-				boundPair = binder.apply(oldSupplier.get());
-
-				pairBound = true;
-			}
-
-			return boundPair.merge(merger);
-		}
-	}
-
-	private static class BoundLazyPair<OldLeft, OldRight, NewLeft, NewRight>
-			implements IPair<NewLeft, NewRight> {
-		private Supplier<OldLeft>										leftSupplier;
-		private Supplier<OldRight>										rightSupplier;
-
-		private BiFunction<OldLeft, OldRight, IPair<NewLeft, NewRight>>	binder;
-
-		private IPair<NewLeft, NewRight>								boundPair;
-
-		private boolean													pairBound;
-
-		public BoundLazyPair(Supplier<OldLeft> leftSupp,
-				Supplier<OldRight> rightSupp,
-				BiFunction<OldLeft, OldRight, IPair<NewLeft, NewRight>> bindr) {
-			leftSupplier = leftSupp;
-			rightSupplier = rightSupp;
-			binder = bindr;
-		}
-
-		@Override
-		public <BoundLeft> IPair<BoundLeft, NewRight> bindLeft(
-				Function<NewLeft, IPair<BoundLeft, NewRight>> leftBinder) {
-			Supplier<NewLeft> leftSupp = () -> {
-				IPair<NewLeft, NewRight> newPair = boundPair;
-
-				if (!pairBound) {
-					newPair = binder.apply(leftSupplier.get(),
-							rightSupplier.get());
-				}
-
-				return newPair.getLeft();
-			};
-
-			return new HalfBoundLazyPair<>(leftSupp, leftBinder);
-		}
-
-		@Override
-		public <BoundRight> IPair<NewLeft, BoundRight> bindRight(
-				Function<NewRight, IPair<NewLeft, BoundRight>> rightBinder) {
-			Supplier<NewRight> rightSupp = () -> {
-				IPair<NewLeft, NewRight> newPair = boundPair;
-
-				if (!pairBound) {
-					newPair = binder.apply(leftSupplier.get(),
-							rightSupplier.get());
-				}
-
-				return newPair.getRight();
-			};
-
-			return new HalfBoundLazyPair<>(rightSupp, rightBinder);
-		}
-
-		@Override
-		public <BoundLeft, BoundRight> IPair<BoundLeft, BoundRight> bind(
-				BiFunction<NewLeft, NewRight, IPair<BoundLeft, BoundRight>> bindr) {
-			IHolder<IPair<NewLeft, NewRight>> newPair = new Identity<>(
-					boundPair);
-			IHolder<Boolean> newPairMade = new Identity<>(pairBound);
-
-			return new BoundLazyPair<>(() -> {
-				if (!newPairMade.getValue()) {
-					newPair.replace(binder.apply(leftSupplier.get(),
-							rightSupplier.get()));
-
-					newPairMade.replace(false);
-				}
-
-				return newPair.unwrap((pair) -> pair.getLeft());
-			}, () -> {
-				if (!newPairMade.getValue()) {
-					newPair.replace(binder.apply(leftSupplier.get(),
-							rightSupplier.get()));
-
-					newPairMade.replace(false);
-				}
-
-				return newPair.unwrap((pair) -> pair.getRight());
-			}, bindr);
-		}
-
-		@Override
-		public <MergedType> MergedType merge(
-				BiFunction<NewLeft, NewRight, MergedType> merger) {
-			if (!pairBound) {
-				boundPair = binder.apply(leftSupplier.get(),
-						rightSupplier.get());
-
-				pairBound = true;
-			}
-
-			return boundPair.merge(merger);
-		}
-	}
-
-	private LeftType			leftValue;
-	private RightType			rightValue;
-
-	private Supplier<LeftType>	leftSupplier;
-	private Supplier<RightType>	rightSupplier;
-
-	private boolean				leftMaterialized;
-	private boolean				rightMaterialized;
-
-	/**
-	 * Create a new lazy pair, using the set value s
-	 * 
-	 * @param leftVal
-	 *            The value for the left side of the pair
-	 * @param rightVal
-	 *            The value for the right side of the pair
-	 */
-	public LazyPair(LeftType leftVal, RightType rightVal) {
-		leftValue = leftVal;
-		rightValue = rightVal;
-
-		leftMaterialized = true;
-		rightMaterialized = true;
-	}
-
-	/**
-	 * Create a new lazy pair from the given value sources
-	 * 
-	 * @param leftSupp
-	 *            The source for a value on the left side of the pair
-	 * @param rightSupp
-	 *            The source for a value on the right side of the pair
-	 */
-	public LazyPair(Supplier<LeftType> leftSupp,
-			Supplier<RightType> rightSupp) {
-		leftSupplier = leftSupp;
-		rightSupplier = rightSupp;
-
-		leftMaterialized = false;
-		rightMaterialized = false;
-	}
-
-	@Override
-	public <BoundLeft> IPair<BoundLeft, RightType> bindLeft(
-			Function<LeftType, IPair<BoundLeft, RightType>> leftBinder) {
-		Supplier<LeftType> leftSupp = () -> {
-			if (leftMaterialized) {
-				return leftValue;
-			}
-
-			return leftSupplier.get();
-		};
-
-		return new HalfBoundLazyPair<>(leftSupp, leftBinder);
-	}
-
-	@Override
-	public <BoundRight> IPair<LeftType, BoundRight> bindRight(
-			Function<RightType, IPair<LeftType, BoundRight>> rightBinder) {
-		Supplier<RightType> rightSupp = () -> {
-			if (rightMaterialized) {
-				return rightValue;
-			}
-
-			return rightSupplier.get();
-		};
-
-		return new HalfBoundLazyPair<>(rightSupp, rightBinder);
-	}
-
-	@Override
-	public <BoundLeft, BoundRight> IPair<BoundLeft, BoundRight> bind(
-			BiFunction<LeftType, RightType, IPair<BoundLeft, BoundRight>> binder) {
-		return new BoundLazyPair<>(leftSupplier, rightSupplier, binder);
-	}
-
-	@Override
-	public <MergedType> MergedType merge(
-			BiFunction<LeftType, RightType, MergedType> merger) {
-		if (!leftMaterialized) {
-			leftValue = leftSupplier.get();
-
-			leftMaterialized = true;
-		}
-
-		if (!rightMaterialized) {
-			rightValue = rightSupplier.get();
-
-			rightMaterialized = true;
-		}
-
-		return merger.apply(leftValue, rightValue);
-	}
-
-	@Override
-	public LeftType getLeft() {
-		if (!leftMaterialized) {
-			leftValue = leftSupplier.get();
-
-			leftMaterialized = true;
-		}
-
-		return leftValue;
-	}
-
-	@Override
-	public RightType getRight() {
-		if (!rightMaterialized) {
-			rightValue = rightSupplier.get();
-
-			rightMaterialized = true;
-		}
-
-		return rightValue;
-	}
-}
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/package-info.java b/BJC-Utils2/src/main/java/bjc/utils/data/package-info.java
index 72e1007..a6f05dd 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/experimental/package-info.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/package-info.java
@@ -4,4 +4,4 @@
  * @author ben
  *
  */
-package bjc.utils.data.experimental;
\ No newline at end of file
+package bjc.utils.data;
\ No newline at end of file