diff --git a/background.html b/background.html
index eeda839c3..90b0679a8 100644
--- a/background.html
+++ b/background.html
@@ -813,6 +813,7 @@
   <script type='text/javascript' src='js/views/banner_view.js'></script>
   <script type="text/javascript" src="js/views/phone-input-view.js"></script>
   <script type='text/javascript' src='js/views/standalone_registration_view.js'></script>
+  <script type='text/javascript' src='js/views/session_registration_view.js'></script>
   <script type='text/javascript' src='js/views/app_view.js'></script>
   <script type='text/javascript' src='js/views/import_view.js'></script>
   <script type='text/javascript' src='js/views/clear_data_view.js'></script>
@@ -823,7 +824,7 @@
   <script type='text/javascript' src='js/views/edit_profile_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/invite_friends_dialog_view.js'></script>
   <script type='text/javascript' src='js/views/user_details_dialog_view.js'></script>
-
+  
   <script type='text/javascript' src='js/wall_clock_listener.js'></script>
   <script type='text/javascript' src='js/rotate_signed_prekey_listener.js'></script>
   <script type='text/javascript' src='js/keychange_listener.js'></script>
diff --git a/js/modules/signal.js b/js/modules/signal.js
index bf214dc98..65ef8c401 100644
--- a/js/modules/signal.js
+++ b/js/modules/signal.js
@@ -50,6 +50,9 @@ const {
 } = require('../../ts/components/conversation/CreateGroupDialog');
 const { EditProfileDialog } = require('../../ts/components/EditProfileDialog');
 const { UserDetailsDialog } = require('../../ts/components/UserDetailsDialog');
+const {
+  SessionRegistrationView,
+} = require('../../ts/components/session/SessionRegistrationView');
 
 const {
   UpdateGroupDialog,
@@ -239,6 +242,7 @@ exports.setup = (options = {}) => {
     CreateGroupDialog,
     EditProfileDialog,
     UserDetailsDialog,
+    SessionRegistrationView,
     ConfirmDialog,
     UpdateGroupDialog,
     InviteFriendsDialog,
diff --git a/js/views/app_view.js b/js/views/app_view.js
index a946577e4..cd45e0080 100644
--- a/js/views/app_view.js
+++ b/js/views/app_view.js
@@ -103,9 +103,9 @@
       }
     },
     openStandalone() {
-      window.addSetupMenuItems();
+      window.addSetupMenuItems(); // FIXME
       this.resetViews();
-      this.standaloneView = new Whisper.StandaloneRegistrationView();
+      this.standaloneView = new Whisper.SessionRegistrationView();
       this.openView(this.standaloneView);
     },
     closeStandalone() {
diff --git a/js/views/session_registration_view.js b/js/views/session_registration_view.js
new file mode 100644
index 000000000..0b3e47a98
--- /dev/null
+++ b/js/views/session_registration_view.js
@@ -0,0 +1,505 @@
+/* global
+ Whisper,
+ getAccountManager,
+ textsecure,
+ setTimeout,
+*/
+
+/* 
+ Whisper,
+ $,
+ getAccountManager,
+ textsecure,
+ i18n,
+ passwordUtil,
+ _,
+ setTimeout,
+ displayNameRegex
+*/
+
+/* eslint-disable more/no-then */
+
+// eslint-disable-next-line func-names
+(function() {
+  'use strict';
+
+  window.Whisper = window.Whisper || {};
+
+  /* const REGISTER_INDEX = 0;
+  /const PROFILE_INDEX = 1;
+  const currentPageIndex = REGISTER_INDEX; */
+
+  Whisper.SessionRegistrationView = Whisper.View.extend({
+    initialize() {
+      this.accountManager = getAccountManager();
+      // Clean status in case the app closed unexpectedly
+      textsecure.storage.remove('secondaryDeviceStatus');
+
+      const number = textsecure.storage.user.getNumber();
+      if (number) {
+        this.$('input.number').val(number);
+      }
+      this.phoneView = new Whisper.PhoneInputView({
+        el: this.$('#phone-number-input'),
+      });
+      this.$('#error').hide();
+
+      this.$('.standalone-mnemonic').hide();
+      this.$('.standalone-secondary-device').hide();
+      this.render();
+
+      // this.onGenerateMnemonic();
+
+      /* const options = window.mnemonic.get_languages().map(language => {
+        const text = language
+          // Split by whitespace or underscore
+          .split(/[\s_]+/)
+          // Capitalise each word
+          .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+          .join(' ');
+        return `<option value="${language}">${text}</option>`;
+      });
+      this.$('#mnemonic-language').append(options);
+      this.$('#mnemonic-language').val('english');
+      this.$('#mnemonic-display-language').append(options);
+      this.$('#mnemonic-display-language').val('english');
+
+      this.$passwordInput = this.$('#password');
+      this.$passwordConfirmationInput = this.$('#password-confirmation');
+      this.$passwordInputError = this.$('.password-inputs .error');
+
+      this.registrationParams = {};
+      this.$pages = this.$('.page');
+      this.pairingInterval = null;
+      this.showRegisterPage();
+
+      this.onValidatePassword();
+
+      this.onSecondaryDeviceRegistered = this.onSecondaryDeviceRegistered.bind(
+        this
+      );
+
+      this.$('#display-name').get(0).oninput = () => {
+        this.sanitiseNameInput();
+      };
+
+      this.$('#display-name').get(0).onpaste = () => {
+        // Sanitise data immediately after paste because it's easier
+        setTimeout(() => {
+          this.sanitiseNameInput();
+        });
+      };
+      this.sanitiseNameInput(); */
+    },
+    render() {
+      this.session_registration_view = new Whisper.ReactWrapperView({
+        className: 'session-full-screen-flow session-standalone-fullscreen',
+        Component: window.Signal.Components.SessionRegistrationView,
+        props: {},
+      });
+
+      this.$el.append(this.session_registration_view.el);
+      return this;
+    },
+    /* events: {
+      keyup: 'onKeyup',
+      'validation input.number': 'onValidation',
+      'click #request-voice': 'requestVoice',
+      'click #request-sms': 'requestSMSVerification',
+      'change #code': 'onChangeCode',
+      'click #register': 'registerWithoutMnemonic',
+      'click #register-mnemonic': 'registerWithMnemonic',
+      'click #register-secondary-device': 'registerSecondaryDevice',
+      'click #cancel-secondary-device': 'cancelSecondaryDevice',
+      'click #back-button': 'onBack',
+      'click #save-button': 'onSaveProfile',
+      'change #mnemonic': 'onChangeMnemonic',
+      'click #generate-mnemonic': 'onGenerateMnemonic',
+      'change #mnemonic-display-language': 'onGenerateMnemonic',
+      'click #copy-mnemonic': 'onCopyMnemonic',
+      'click .section-toggle': 'toggleSection',
+      'keyup #password': 'onValidatePassword',
+      'keyup #password-confirmation': 'onValidatePassword',
+    }, 
+
+    sanitiseNameInput() {
+       const oldVal = this.$('#display-name').val();
+      const newVal = oldVal.replace(displayNameRegex, '');
+      this.$('#display-name').val(newVal);
+      if (_.isEmpty(newVal)) {
+        this.$('#save-button').attr('disabled', 'disabled');
+        return false;
+      }
+      this.$('#save-button').removeAttr('disabled'); 
+
+      return true;
+    },
+     async showPage(pageIndex) {
+      // eslint-disable-next-line func-names
+       this.$pages.each(function(index) {
+        if (index !== pageIndex) {
+          $(this).hide();
+        } else {
+          $(this).show();
+          currentPageIndex = pageIndex;
+        }
+      }); 
+    },
+    async showRegisterPage() {
+       this.registrationParams = {};
+      this.showPage(REGISTER_INDEX); 
+    },
+    async showProfilePage(mnemonic, language) {
+      /* this.registrationParams = {
+        mnemonic,
+        language,
+      };
+      this.$passwordInput.val('');
+      this.$passwordConfirmationInput.val('');
+      this.onValidatePassword();
+      this.showPage(PROFILE_INDEX);
+      this.$('#display-name').focus(); 
+    },
+    onKeyup(event) {
+      if (
+        currentPageIndex !== PROFILE_INDEX &&
+        currentPageIndex !== REGISTER_INDEX
+      ) {
+        // Only want enter/escape keys to work on profile page
+        return;
+      }
+
+      const validName = this.sanitiseNameInput();
+      switch (event.key) {
+        case 'Enter':
+          if (event.target.id === 'mnemonic') {
+            this.registerWithMnemonic();
+          } else if (event.target.id === 'primary-pubkey') {
+            this.registerSecondaryDevice();
+          } else if (validName) {
+            this.onSaveProfile();
+          }
+          break;
+        case 'Escape':
+        case 'Esc':
+          this.onBack();
+          break;
+        default:
+      }
+    },
+     async register(mnemonic, language) {
+      // Make sure the password is valid
+      if (this.validatePassword()) {
+        this.showToast(i18n('invalidPassword'));
+        return;
+      }
+
+      const input = this.trim(this.$passwordInput.val());
+
+      // Ensure we clear the secondary device registration status
+      textsecure.storage.remove('secondaryDeviceStatus');
+
+      try {
+        await this.resetRegistration();
+
+        await window.setPassword(input);
+        await this.accountManager.registerSingleDevice(
+          mnemonic,
+          language,
+          this.trim(this.$('#display-name').val())
+        );
+        this.$el.trigger('openInbox');
+      } catch (e) {
+        if (typeof e === 'string') {
+          this.showToast(e);
+        }
+        this.log(e);
+      }
+    },
+    registerWithoutMnemonic() {
+      const mnemonic = this.$('#mnemonic-display').text();
+      const language = this.$('#mnemonic-display-language').val();
+      this.showProfilePage(mnemonic, language);
+    },
+    async onSecondaryDeviceRegistered() {
+      clearInterval(this.pairingInterval);
+      // Ensure the left menu is updated
+      Whisper.events.trigger('userChanged', { isSecondaryDevice: true });
+      // will re-run the background initialisation
+      Whisper.events.trigger('registration_done');
+      this.$el.trigger('openInbox');
+    },
+    async resetRegistration() {
+      await window.Signal.Data.removeAllIdentityKeys();
+      await window.Signal.Data.removeAllPrivateConversations();
+      Whisper.Registration.remove();
+      // Do not remove all items since they are only set
+      // at startup.
+      textsecure.storage.remove('identityKey');
+      textsecure.storage.remove('secondaryDeviceStatus');
+      window.ConversationController.reset();
+      await window.ConversationController.load();
+      Whisper.RotateSignedPreKeyListener.stop(Whisper.events);
+    },
+    async cancelSecondaryDevice() {
+      Whisper.events.off(
+        'secondaryDeviceRegistration',
+        this.onSecondaryDeviceRegistered
+      );
+      this.$('#register-secondary-device')
+        .removeAttr('disabled')
+        .text('Link');
+      this.$('#cancel-secondary-device').hide();
+      this.$('.standalone-secondary-device #pubkey').text('');
+      await this.resetRegistration();
+    },
+    async registerSecondaryDevice() {
+      if (textsecure.storage.get('secondaryDeviceStatus') === 'ongoing') {
+        return;
+      }
+      await this.resetRegistration();
+      textsecure.storage.put('secondaryDeviceStatus', 'ongoing');
+      this.$('#register-secondary-device')
+        .attr('disabled', 'disabled')
+        .text('Sending...');
+      this.$('#cancel-secondary-device').show();
+      const mnemonic = this.$('#mnemonic-display').text();
+      const language = this.$('#mnemonic-display-language').val();
+      const primaryPubKey = this.$('#primary-pubkey').val();
+      this.$('.standalone-secondary-device #error').hide();
+      // Ensure only one listener
+      Whisper.events.off(
+        'secondaryDeviceRegistration',
+        this.onSecondaryDeviceRegistered
+      );
+      Whisper.events.once(
+        'secondaryDeviceRegistration',
+        this.onSecondaryDeviceRegistered
+      );
+      const onError = async error => {
+        this.$('.standalone-secondary-device #error')
+          .text(error)
+          .show();
+        await this.resetRegistration();
+        this.$('#register-secondary-device')
+          .removeAttr('disabled')
+          .text('Link');
+        this.$('#cancel-secondary-device').hide();
+      };
+      const c = new Whisper.Conversation({
+        id: primaryPubKey,
+        type: 'private',
+      });
+      const validationError = c.validateNumber();
+      if (validationError) {
+        onError('Invalid public key');
+        return;
+      }
+      try {
+        await this.accountManager.registerSingleDevice(
+          mnemonic,
+          language,
+          null
+        );
+        await this.accountManager.requestPairing(primaryPubKey);
+        const pubkey = textsecure.storage.user.getNumber();
+        const words = window.mnemonic.pubkey_to_secret_words(pubkey);
+
+        this.$('.standalone-secondary-device #pubkey').text(
+          `Here is your secret:\n${words}`
+        );
+      } catch (e) {
+        onError(e);
+      }
+    },
+    registerWithMnemonic() {
+      const mnemonic = this.$('#mnemonic').val();
+      const language = this.$('#mnemonic-language').val();
+      try {
+        window.mnemonic.mn_decode(mnemonic, language);
+      } catch (error) {
+        this.$('#mnemonic').addClass('error-input');
+        this.$('#error').text(error);
+        this.$('#error').show();
+        return;
+      }
+      this.$('#error').hide();
+      this.$('#mnemonic').removeClass('error-input');
+      if (!mnemonic) {
+        this.log('Please provide a mnemonic word list');
+      } else {
+        this.showProfilePage(mnemonic, language);
+      }
+    },
+    onSaveProfile() {
+      if (_.isEmpty(this.registrationParams)) {
+        this.onBack();
+        return;
+      }
+
+      const { mnemonic, language } = this.registrationParams;
+      this.register(mnemonic, language);
+    },
+    onBack() {
+      this.showRegisterPage();
+    },
+    onChangeMnemonic() {
+      this.$('#status').html('');
+    },
+    async onGenerateMnemonic() {
+      const language = this.$('#mnemonic-display-language').val();
+      const mnemonic = await this.accountManager.generateMnemonic(language);
+      this.$('#mnemonic-display').text(mnemonic);
+    },
+    onCopyMnemonic() {
+      window.clipboard.writeText(this.$('#mnemonic-display').text());
+
+      this.showToast(i18n('copiedMnemonic'));
+    }, */
+    log(s) {
+      window.log.info(s);
+      this.$('#status').text(s);
+    },
+    displayError(error) {
+      this.$('#error')
+        .hide()
+        .text(error)
+        .addClass('in')
+        .fadeIn();
+    },
+    /* onValidation() {
+      if (this.$('#number-container').hasClass('valid')) {
+        this.$('#request-sms, #request-voice').removeAttr('disabled');
+      } else {
+        this.$('#request-sms, #request-voice').prop('disabled', 'disabled');
+      }
+    },
+    onChangeCode() {
+      if (!this.validateCode()) {
+        this.$('#code').addClass('invalid');
+      } else {
+        this.$('#code').removeClass('invalid');
+      }
+    },
+    requestVoice() {
+      window.removeSetupMenuItems();
+      this.$('#error').hide();
+      const number = this.phoneView.validateNumber();
+      if (number) {
+        this.accountManager
+          .requestVoiceVerification(number)
+          .catch(this.displayError.bind(this));
+        this.$('#step2')
+          .addClass('in')
+          .fadeIn();
+      } else {
+        this.$('#number-container').addClass('invalid');
+      }
+    },
+    requestSMSVerification() {
+      window.removeSetupMenuItems();
+      $('#error').hide();
+      const number = this.phoneView.validateNumber();
+      if (number) {
+        this.accountManager
+          .requestSMSVerification(number)
+          .catch(this.displayError.bind(this));
+        this.$('#step2')
+          .addClass('in')
+          .fadeIn();
+      } else {
+        this.$('#number-container').addClass('invalid');
+      }
+    },
+
+    toggleSection(e) {
+      function focusInput() {
+        const inputs = $(this).find('input');
+        if ($(this).is(':visible')) {
+          if (inputs[0]) {
+            inputs[0].focus();
+          }
+        }
+      }
+      // Expand or collapse this panel
+      const $target = this.$(e.currentTarget);
+      const $next = $target.next();
+
+      // Toggle section visibility
+      $next.slideToggle('fast', focusInput);
+      $target.toggleClass('section-toggle-visible');
+
+      // Hide the other sections
+      this.$('.section-toggle')
+        .not($target)
+        .removeClass('section-toggle-visible');
+      this.$('.section-content')
+        .not($next)
+        .slideUp('fast');
+    },
+    validatePassword() {
+      const input = this.trim(this.$passwordInput.val());
+      const confirmationInput = this.trim(
+        this.$passwordConfirmationInput.val()
+      );
+
+      // If user hasn't set a value then skip
+      if (!input && !confirmationInput) {
+        return null;
+      }
+
+      const error = passwordUtil.validatePassword(input, i18n);
+      if (error) {
+        return error;
+      }
+
+      if (input !== confirmationInput) {
+        return "Password don't match";
+      }
+
+      return null;
+    },
+    onValidatePassword() {
+      const passwordValidation = this.validatePassword();
+      if (passwordValidation) {
+        this.$passwordInput.addClass('error-input');
+        this.$passwordConfirmationInput.addClass('error-input');
+
+        this.$passwordInput.removeClass('match-input');
+        this.$passwordConfirmationInput.removeClass('match-input');
+
+        this.$passwordInputError.text(passwordValidation);
+        this.$passwordInputError.show();
+      } else {
+        this.$passwordInput.removeClass('error-input');
+        this.$passwordConfirmationInput.removeClass('error-input');
+
+        this.$passwordInputError.text('');
+        this.$passwordInputError.hide();
+
+        // Show green box around inputs that match
+        const input = this.trim(this.$passwordInput.val());
+        const confirmationInput = this.trim(
+          this.$passwordConfirmationInput.val()
+        );
+        if (input && input === confirmationInput) {
+          this.$passwordInput.addClass('match-input');
+          this.$passwordConfirmationInput.addClass('match-input');
+        } else {
+          this.$passwordInput.removeClass('match-input');
+          this.$passwordConfirmationInput.removeClass('match-input');
+        }
+      }
+    },
+    trim(value) {
+      return value ? value.trim() : value;
+    }, */
+    showToast(message) {
+      const toast = new Whisper.MessageToastView({
+        message,
+      });
+      toast.$el.appendTo(this.$el);
+      toast.render();
+    },
+  });
+})();
diff --git a/ts/components/session/SessionRegistrationView.tsx b/ts/components/session/SessionRegistrationView.tsx
new file mode 100644
index 000000000..7be54a5c7
--- /dev/null
+++ b/ts/components/session/SessionRegistrationView.tsx
@@ -0,0 +1,95 @@
+import React from 'react';
+import { SessionButton, SessionButtonTypes } from './SessionButton';
+import { AccentText } from './AccentText';
+//import classNames from 'classnames';
+
+//import { LocalizerType } from '../../types/Util';
+
+declare global {
+  interface Window {
+    displayNameRegex: any;
+  }
+}
+
+interface Props {
+  showSubtitle: boolean;
+  /* profileName: string;
+  avatarPath: string;
+  avatarColor: string;
+  pubkey: string;
+  onClose: any;
+  onStartConversation: any; */
+}
+/*
+interface State {
+  avatarColor: string;
+} */
+
+export class SessionRegistrationView extends React.Component<Props> {
+  constructor(props: Props) {
+    super(props);
+
+    //this.closeDialog = this.closeDialog.bind(this);
+    window.addEventListener('keyup', this.onKeyUp);
+  }
+
+  public render() {
+    //const i18n = this.props.i18n;
+    //const cancelText = i18n('cancel');
+
+    const { showSubtitle } = this.props;
+
+    return (
+      <div className="session-content">
+        <div className="session-content-accent">
+          <AccentText showSubtitle={showSubtitle} />
+        </div>
+        <div className="session-content-registration">
+          <SessionButton
+            onClick={() => {
+              alert('clicked');
+            }}
+            buttonType={SessionButtonTypes.green}
+            text="Generate Session ID"
+          />
+        </div>
+      </div>
+    );
+  }
+
+  /*private renderAvatar() {
+    const avatarPath = this.props.avatarPath;
+    const color = this.props.avatarColor;
+
+    return (
+      <Avatar
+        avatarPath={avatarPath}
+        color={color}
+        conversationType="direct"
+        i18n={this.props.i18n}
+        name={this.props.profileName}
+        phoneNumber={this.props.pubkey}
+        profileName={this.props.profileName}
+        size={80}
+      />
+    );
+  }
+*/
+  private onKeyUp(event: any) {
+    switch (event.key) {
+      case 'Enter':
+        break;
+      case 'Esc':
+      case 'Escape':
+        //this.closeDialog();
+        break;
+      default:
+    }
+  }
+
+  /*rivate closeDialog() {
+    window.removeEventListener('keyup', this.onKeyUp);
+    this.props.onClose();
+  }
+*/
+}