diff --git a/src/Signup.js b/src/Signup.js
index 18d338cc32..b8169a0f95 100644
--- a/src/Signup.js
+++ b/src/Signup.js
@@ -54,6 +54,9 @@ class Signup {
  * This exists for the lifetime of a user's attempt to register an account,
  * so if their registration attempt fails for whatever reason and they
  * try again, call register() on the same instance again.
+ *
+ * TODO: parts of this overlap heavily with InteractiveAuth in the js-sdk. It
+ * would be nice to make use of that rather than rolling our own version of it.
  */
 class Register extends Signup {
     constructor(hsUrl, isUrl, opts) {
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 0f1b6d331f..1d8efc3649 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -28,6 +28,10 @@ var CaptchaForm = require("../../views/login/CaptchaForm");
 
 var MIN_PASSWORD_LENGTH = 6;
 
+/**
+ * TODO: It would be nice to make use of the InteractiveAuthEntryComponents
+ * here, rather than inventing our own.
+ */
 module.exports = React.createClass({
     displayName: 'Registration',