diff --git a/README.md b/README.md
index 1c3e5d9f..cb80e01b 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ incomplete list of things that still have to be done before this can be used:
 - Interfaces left to implement:
   - `YaHostApplicationHostImpl::createComponent()`
   - `IConnectionPoint` to supplement `IComponent`
-  - `IEditController{,2}`
+  - Finish implementing `IEditController{,2}`
   - All other mandatory interfaces
   - All other optional interfaces
 - Fully implemented: see [this
diff --git a/meson.build b/meson.build
index 649acc47..3a5a944a 100644
--- a/meson.build
+++ b/meson.build
@@ -79,6 +79,7 @@ vst3_plugin_sources = [
   'src/common/logging/vst3.cpp',
   'src/common/serialization/vst3/plugin/audio-processor.cpp',
   'src/common/serialization/vst3/plugin/component.cpp',
+  'src/common/serialization/vst3/plugin/connection-point.cpp',
   'src/common/serialization/vst3/plugin/edit-controller.cpp',
   'src/common/serialization/vst3/plugin/plugin-base.cpp',
   'src/common/serialization/vst3/base.cpp',
@@ -122,6 +123,7 @@ if with_vst3
     'src/common/logging/vst3.cpp',
     'src/common/serialization/vst3/plugin/audio-processor.cpp',
     'src/common/serialization/vst3/plugin/component.cpp',
+    'src/common/serialization/vst3/plugin/connection-point.cpp',
     'src/common/serialization/vst3/plugin/edit-controller.cpp',
     'src/common/serialization/vst3/plugin/plugin-base.cpp',
     'src/common/serialization/vst3/base.cpp',
diff --git a/src/common/serialization/vst3/plugin-proxy.cpp b/src/common/serialization/vst3/plugin-proxy.cpp
index db6b5746..12637ad6 100644
--- a/src/common/serialization/vst3/plugin-proxy.cpp
+++ b/src/common/serialization/vst3/plugin-proxy.cpp
@@ -24,12 +24,14 @@ Vst3PluginProxy::ConstructArgs::ConstructArgs(
     : instance_id(instance_id),
       audio_processor_args(object),
       component_args(object),
+      connection_point_args(object),
       edit_controller_2_args(object),
       plugin_base_args(object) {}
 
 Vst3PluginProxy::Vst3PluginProxy(const ConstructArgs&& args)
     : YaAudioProcessor(std::move(args.audio_processor_args)),
       YaComponent(std::move(args.component_args)),
+      YaConnectionPoint(std::move(args.connection_point_args)),
       YaEditController2(std::move(args.edit_controller_2_args)),
       YaPluginBase(std::move(args.plugin_base_args)),
       arguments(std::move(args)){FUNKNOWN_CTOR}
@@ -71,6 +73,10 @@ tresult PLUGIN_API Vst3PluginProxy::queryInterface(Steinberg::FIDString _iid,
         QUERY_INTERFACE(_iid, obj, Steinberg::Vst::IComponent::iid,
                         Steinberg::Vst::IComponent)
     }
+    if (YaConnectionPoint::supported()) {
+        QUERY_INTERFACE(_iid, obj, Steinberg::Vst::IConnectionPoint::iid,
+                        Steinberg::Vst::IConnectionPoint)
+    }
     if (YaEditController2::supported_version_1()) {
         QUERY_INTERFACE(_iid, obj, Steinberg::Vst::IEditController::iid,
                         Steinberg::Vst::IEditController)
diff --git a/src/common/serialization/vst3/plugin-proxy.h b/src/common/serialization/vst3/plugin-proxy.h
index 8bb54ec1..dc7a67ca 100644
--- a/src/common/serialization/vst3/plugin-proxy.h
+++ b/src/common/serialization/vst3/plugin-proxy.h
@@ -24,6 +24,7 @@
 #include "host-application.h"
 #include "plugin/audio-processor.h"
 #include "plugin/component.h"
+#include "plugin/connection-point.h"
 #include "plugin/edit-controller.h"
 #include "plugin/plugin-base.h"
 
@@ -55,6 +56,7 @@
  */
 class Vst3PluginProxy : public YaAudioProcessor,
                         public YaComponent,
+                        public YaConnectionPoint,
                         public YaEditController2,
                         public YaPluginBase {
    public:
@@ -77,6 +79,7 @@ class Vst3PluginProxy : public YaAudioProcessor,
 
         YaAudioProcessor::ConstructArgs audio_processor_args;
         YaComponent::ConstructArgs component_args;
+        YaConnectionPoint::ConstructArgs connection_point_args;
         YaEditController2::ConstructArgs edit_controller_2_args;
         YaPluginBase::ConstructArgs plugin_base_args;
 
@@ -84,8 +87,9 @@ class Vst3PluginProxy : public YaAudioProcessor,
         void serialize(S& s) {
             s.value8b(instance_id);
             s.object(audio_processor_args);
-            s.object(edit_controller_2_args);
             s.object(component_args);
+            s.object(connection_point_args);
+            s.object(edit_controller_2_args);
             s.object(plugin_base_args);
         }
     };
diff --git a/src/common/serialization/vst3/plugin/connection-point.cpp b/src/common/serialization/vst3/plugin/connection-point.cpp
new file mode 100644
index 00000000..5114521d
--- /dev/null
+++ b/src/common/serialization/vst3/plugin/connection-point.cpp
@@ -0,0 +1,27 @@
+// yabridge: a Wine VST bridge
+// Copyright (C) 2020  Robbert van der Helm
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#include "connection-point.h"
+
+YaConnectionPoint::ConstructArgs::ConstructArgs() {}
+
+YaConnectionPoint::ConstructArgs::ConstructArgs(
+    Steinberg::IPtr<Steinberg::FUnknown> object)
+    : supported(
+          Steinberg::FUnknownPtr<Steinberg::Vst::IConnectionPoint>(object)) {}
+
+YaConnectionPoint::YaConnectionPoint(const ConstructArgs&& args)
+    : arguments(std::move(args)) {}
diff --git a/src/common/serialization/vst3/plugin/connection-point.h b/src/common/serialization/vst3/plugin/connection-point.h
new file mode 100644
index 00000000..0829c280
--- /dev/null
+++ b/src/common/serialization/vst3/plugin/connection-point.h
@@ -0,0 +1,79 @@
+// yabridge: a Wine VST bridge
+// Copyright (C) 2020  Robbert van der Helm
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#pragma once
+
+#include <bitsery/ext/std_optional.h>
+#include <pluginterfaces/vst/ivstmessage.h>
+
+#include "../../common.h"
+#include "../base.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+
+/**
+ * Wraps around `IConnectionPoint` for serialization purposes. This is
+ * instantiated as part of `Vst3PluginProxy`. Because we use this giant
+ * monolithic proxy class we can easily directly connect different objects by
+ * checking if they're a `Vst3PluginProxy` and then fetching that object's
+ * instance ID (if the host doesn't place a proxy object here).
+ *
+ * TODO: Make sure we somehow handle proxies created by the host here.
+ */
+class YaConnectionPoint : public Steinberg::Vst::IConnectionPoint {
+   public:
+    /**
+     * These are the arguments for creating a `YaConnectionPoint`.
+     */
+    struct ConstructArgs {
+        ConstructArgs();
+
+        /**
+         * Check whether an existing implementation implements
+         * `IConnectionPoint` and read arguments from it.
+         */
+        ConstructArgs(Steinberg::IPtr<Steinberg::FUnknown> object);
+
+        /**
+         * Whether the object supported this interface.
+         */
+        bool supported;
+
+        template <typename S>
+        void serialize(S& s) {
+            s.value1b(supported);
+        }
+    };
+
+    /**
+     * Instantiate this instance with arguments read from another interface
+     * implementation.
+     */
+    YaConnectionPoint(const ConstructArgs&& args);
+
+    inline bool supported() const { return arguments.supported; }
+
+    virtual tresult PLUGIN_API connect(IConnectionPoint* other) override = 0;
+    virtual tresult PLUGIN_API disconnect(IConnectionPoint* other) override = 0;
+    virtual tresult PLUGIN_API
+    notify(Steinberg::Vst::IMessage* message) override = 0;
+
+   protected:
+    ConstructArgs arguments;
+};
+
+#pragma GCC diagnostic pop
diff --git a/src/plugin/bridges/vst3-impls/plugin-proxy.cpp b/src/plugin/bridges/vst3-impls/plugin-proxy.cpp
index f0cd6c6d..e809b94f 100644
--- a/src/plugin/bridges/vst3-impls/plugin-proxy.cpp
+++ b/src/plugin/bridges/vst3-impls/plugin-proxy.cpp
@@ -188,6 +188,25 @@ tresult PLUGIN_API Vst3PluginProxyImpl::getState(Steinberg::IBStream* state) {
     return response.result;
 }
 
+tresult PLUGIN_API Vst3PluginProxyImpl::connect(IConnectionPoint* other) {
+    // TODO: Implement
+    bridge.logger.log("TODO IConnectionPoint::connect()");
+    return Steinberg::kNotImplemented;
+}
+
+tresult PLUGIN_API Vst3PluginProxyImpl::disconnect(IConnectionPoint* other) {
+    // TODO: Implement
+    bridge.logger.log("TODO IConnectionPoint::disconnect()");
+    return Steinberg::kNotImplemented;
+}
+
+tresult PLUGIN_API
+Vst3PluginProxyImpl::notify(Steinberg::Vst::IMessage* message) {
+    // TODO: Implement
+    bridge.logger.log("TODO IConnectionPoint::notify()");
+    return Steinberg::kNotImplemented;
+}
+
 tresult PLUGIN_API
 Vst3PluginProxyImpl::setComponentState(Steinberg::IBStream* state) {
     return bridge.send_message(YaEditController2::SetComponentState{
diff --git a/src/plugin/bridges/vst3-impls/plugin-proxy.h b/src/plugin/bridges/vst3-impls/plugin-proxy.h
index 964460c8..7d6bbafa 100644
--- a/src/plugin/bridges/vst3-impls/plugin-proxy.h
+++ b/src/plugin/bridges/vst3-impls/plugin-proxy.h
@@ -79,6 +79,11 @@ class Vst3PluginProxyImpl : public Vst3PluginProxy {
     tresult PLUGIN_API setState(Steinberg::IBStream* state) override;
     tresult PLUGIN_API getState(Steinberg::IBStream* state) override;
 
+    // From `IConnectionPoint`
+    tresult PLUGIN_API connect(IConnectionPoint* other) override;
+    tresult PLUGIN_API disconnect(IConnectionPoint* other) override;
+    tresult PLUGIN_API notify(Steinberg::Vst::IMessage* message) override;
+
     // From `IEditController`
     tresult PLUGIN_API setComponentState(Steinberg::IBStream* state) override;
     // `IEditController` also contains `getState()` and `setState()`  functions.