diff --git a/Funcky/Monads/Option.cs b/Funcky/Monads/Option.cs
deleted file mode 100644
index cdd47cc6..00000000
--- a/Funcky/Monads/Option.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Funcky.GenericConstraints;
-
-namespace Funcky.Monads
-{
-    public readonly struct Option<TItem> : IToString
-        where TItem : notnull
-    {
-        private readonly bool _hasItem;
-        private readonly TItem _item;
-
-        internal Option(TItem item)
-        {
-            if (item == null)
-            {
-                throw new ArgumentNullException(nameof(item));
-            }
-
-            _item = item;
-            _hasItem = true;
-        }
-
-        public static bool operator ==(Option<TItem> lhs, Option<TItem> rhs) => lhs.Equals(rhs);
-
-        public static bool operator !=(Option<TItem> lhs, Option<TItem> rhs) => !lhs.Equals(rhs);
-
-        public static Option<TItem> None() => default;
-
-        public Option<TResult> Select<TResult>(Func<TItem, TResult> selector)
-            where TResult : notnull
-            => _hasItem
-                ? Option.Some(selector(_item))
-                : Option<TResult>.None();
-
-        public Option<TResult> SelectMany<TMaybe, TResult>(Func<TItem, Option<TMaybe>> maybeSelector, Func<TItem, TMaybe, TResult> resultSelector)
-            where TResult : notnull
-            where TMaybe : notnull
-        {
-            if (_hasItem)
-            {
-                var selectedMaybe = maybeSelector(_item);
-                if (selectedMaybe._hasItem)
-                {
-                    return Option.Some(resultSelector(_item, selectedMaybe._item));
-                }
-            }
-
-            return Option<TResult>.None();
-        }
-
-        public Option<TItem> Where(Func<TItem, bool> predicate)
-            => AndThen(item => predicate(item) ? Option.Some(item) : None());
-
-        public TResult Match<TResult>(TResult none, Func<TItem, TResult> some)
-            => _hasItem
-                ? some(_item)
-                : none;
-
-        public TResult Match<TResult>(Func<TResult> none, Func<TItem, TResult> some)
-            => _hasItem
-                  ? some(_item)
-                  : none();
-
-        public void Match(Action none, Action<TItem> some)
-        {
-            if (_hasItem)
-            {
-                some(_item);
-            }
-            else
-            {
-                none();
-            }
-        }
-
-        public Option<TItem> OrElse(Option<TItem> elseOption)
-            => _hasItem
-                ? this
-                : elseOption;
-
-        public TItem OrElse(TItem elseOption)
-            => _hasItem
-                ? _item
-                : elseOption;
-
-        public Option<TItem> OrElse(Func<Option<TItem>> elseOption)
-            => _hasItem
-                ? this
-                : elseOption.Invoke();
-
-        public TItem OrElse(Func<TItem> elseOption)
-            => _hasItem
-                ? _item
-                : elseOption.Invoke();
-
-        public Option<TResult> AndThen<TResult>(Func<TItem, TResult> andThenFunction)
-            where TResult : notnull
-            => _hasItem
-                ? Option.Some(andThenFunction(_item))
-                : Option<TResult>.None();
-
-        public Option<TResult> AndThen<TResult>(Func<TItem, Option<TResult>> andThenFunction)
-            where TResult : notnull
-            => _hasItem
-                ? andThenFunction(_item)
-                : Option<TResult>.None();
-
-        public void AndThen(Action<TItem> andThenFunction)
-        {
-            if (_hasItem)
-            {
-                andThenFunction(_item);
-            }
-        }
-
-        /// <summary>
-        /// Returns an <see cref="IEnumerable{T}"/> that yields exactly one value when the option
-        /// has an item and nothing when the option is empty.
-        /// </summary>
-        public IEnumerable<TItem> ToEnumerable()
-            => Match(
-                   none: Enumerable.Empty<TItem>(),
-                   some: value => Enumerable.Repeat(value, 1));
-
-        public override bool Equals(object obj)
-            => obj is Option<TItem> other
-            && Equals(_item, other._item);
-
-        public override int GetHashCode() =>
-            Select(item => item.GetHashCode()).OrElse(0);
-
-        public override string ToString()
-            => Match(
-                none: "None",
-                some: value => $"Some({value})");
-    }
-
-    public static class Option
-    {
-        public static Option<TItem> Some<TItem>(TItem item)
-            where TItem : notnull
-            => new Option<TItem>(item);
-
-        public static Option<TItem> Some<TItem>(Option<TItem> item)
-            where TItem : notnull
-            => item;
-
-        /// <summary>
-        /// Creates an <see cref="Option{T}"/> from a nullable value.
-        /// </summary>
-        public static Option<T> From<T>(T? item, RequireClass<T>? ω = null)
-            where T : class
-            => item is { } value ? Some(value) : Option<T>.None();
-
-        /// <inheritdoc cref="From{T}(T, RequireClass{T})"/>
-        public static Option<T> From<T>(T item, RequireStruct<T>? ω = null)
-            where T : struct
-            => Some(item);
-
-        /// <inheritdoc cref="From{T}(T, RequireClass{T})"/>
-        public static Option<T> From<T>(T? item)
-            where T : struct
-            => item.HasValue ? Some(item.Value) : Option<T>.None();
-    }
-}
diff --git a/Funcky/Monads/Option/Option.Convenience.cs b/Funcky/Monads/Option/Option.Convenience.cs
new file mode 100644
index 00000000..395a619b
--- /dev/null
+++ b/Funcky/Monads/Option/Option.Convenience.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using static Funcky.Functional;
+
+namespace Funcky.Monads
+{
+    public readonly partial struct Option<TItem>
+    {
+        public Option<TItem> Where(Func<TItem, bool> predicate)
+            => SelectMany(item => predicate(item) ? Option.Some(item) : None());
+
+        public Option<TItem> OrElse(Option<TItem> elseOption)
+            => Match(none: elseOption, some: Option.Some);
+
+        public TItem OrElse(TItem elseOption)
+            => Match(none: elseOption, some: Identity);
+
+        public Option<TItem> OrElse(Func<Option<TItem>> elseOption)
+            => Match(none: elseOption, some: Option.Some);
+
+        public TItem OrElse(Func<TItem> elseOption)
+            => Match(none: elseOption, some: Identity);
+
+        public Option<TResult> AndThen<TResult>(Func<TItem, TResult> andThenFunction)
+            where TResult : notnull
+            => Select(andThenFunction);
+
+        public Option<TResult> AndThen<TResult>(Func<TItem, Option<TResult>> andThenFunction)
+            where TResult : notnull
+            => SelectMany(andThenFunction);
+
+        public void AndThen(Action<TItem> andThenFunction)
+            => Match(none: NoOperation, some: andThenFunction);
+
+        /// <summary>
+        /// Returns an <see cref="IEnumerable{T}"/> that yields exactly one value when the option
+        /// has an item and nothing when the option is empty.
+        /// </summary>
+        public IEnumerable<TItem> ToEnumerable()
+            => Match(
+                none: Enumerable.Empty<TItem>(),
+                some: value => Enumerable.Repeat(value, 1));
+    }
+}
diff --git a/Funcky/Monads/Option/Option.Core.cs b/Funcky/Monads/Option/Option.Core.cs
new file mode 100644
index 00000000..2cce92c3
--- /dev/null
+++ b/Funcky/Monads/Option/Option.Core.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Funcky.GenericConstraints;
+
+namespace Funcky.Monads
+{
+    public readonly partial struct Option<TItem> : IToString
+        where TItem : notnull
+    {
+        private readonly bool _hasItem;
+        private readonly TItem _item;
+
+        internal Option(TItem item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException(nameof(item));
+            }
+
+            _item = item;
+            _hasItem = true;
+        }
+
+        public static bool operator ==(Option<TItem> lhs, Option<TItem> rhs) => lhs.Equals(rhs);
+
+        public static bool operator !=(Option<TItem> lhs, Option<TItem> rhs) => !lhs.Equals(rhs);
+
+        public static Option<TItem> None() => default;
+
+        public Option<TResult> Select<TResult>(Func<TItem, TResult> selector)
+            where TResult : notnull
+            => Match(
+                 none: Option<TResult>.None,
+                 item => Option.Some(selector(item)));
+
+        public Option<TResult> SelectMany<TResult>(Func<TItem, Option<TResult>> selector)
+            where TResult : notnull
+            => SelectMany(selector, (_, result) => result);
+
+        public Option<TResult> SelectMany<TMaybe, TResult>(Func<TItem, Option<TMaybe>> maybeSelector, Func<TItem, TMaybe, TResult> resultSelector)
+            where TResult : notnull
+            where TMaybe : notnull
+            => Match(
+                none: Option<TResult>.None,
+                some: item => maybeSelector(item).Select(
+                    maybe => resultSelector(item, maybe)));
+
+        public TResult Match<TResult>(TResult none, Func<TItem, TResult> some)
+            => Match(() => none, some);
+
+        public TResult Match<TResult>(Func<TResult> none, Func<TItem, TResult> some)
+            => _hasItem
+                  ? some(_item)
+                  : none();
+
+        public void Match(Action none, Action<TItem> some)
+        {
+            if (_hasItem)
+            {
+                some(_item);
+            }
+            else
+            {
+                none();
+            }
+        }
+
+        public override bool Equals(object obj)
+            => obj is Option<TItem> other && Equals(_item, other._item);
+
+        public override int GetHashCode()
+            => Match(
+                 none: 0,
+                 some: item => item.GetHashCode());
+
+        public override string ToString()
+            => Match(
+                 none: "None",
+                 some: value => $"Some({value})");
+    }
+
+    public static partial class Option
+    {
+        public static Option<TItem> Some<TItem>(TItem item)
+            where TItem : notnull
+            => new Option<TItem>(item);
+
+        public static Option<TItem> Some<TItem>(Option<TItem> item)
+            where TItem : notnull
+            => item;
+    }
+}
diff --git a/Funcky/Monads/Option/Option.FromNullable.cs b/Funcky/Monads/Option/Option.FromNullable.cs
new file mode 100644
index 00000000..c63004b3
--- /dev/null
+++ b/Funcky/Monads/Option/Option.FromNullable.cs
@@ -0,0 +1,24 @@
+using Funcky.GenericConstraints;
+
+namespace Funcky.Monads
+{
+    public static partial class Option
+    {
+        /// <summary>
+        /// Creates an <see cref="Option{T}"/> from a nullable value.
+        /// </summary>
+        public static Option<T> From<T>(T? item, RequireClass<T>? ω = null)
+            where T : class
+            => item is { } value ? Some(value) : Option<T>.None();
+
+        /// <inheritdoc cref="From{T}(T, RequireClass{T})"/>
+        public static Option<T> From<T>(T item, RequireStruct<T>? ω = null)
+            where T : struct
+            => Some(item);
+
+        /// <inheritdoc cref="From{T}(T, RequireClass{T})"/>
+        public static Option<T> From<T>(T? item)
+            where T : struct
+            => item.HasValue ? Some(item.Value) : Option<T>.None();
+    }
+}
diff --git a/changelog.md b/changelog.md
index 6978a856..7d1aaeac 100644
--- a/changelog.md
+++ b/changelog.md
@@ -16,3 +16,5 @@
 ## Unreleased
 * Added overload for AndThen which flattens the Option
 * Add `Where` method to `Option<T>`, which allows filtering the `Option` by a predicate.
+* Add overload for `Option<T>.SelectMany` that takes only a selector.
+ 
\ No newline at end of file