diff --git a/app/index.js b/app/index.js
index 906c765..52aa38c 100644
--- a/app/index.js
+++ b/app/index.js
@@ -2,6 +2,7 @@ import { app, dialog, shell } from 'electron'
 import { autoUpdater } from 'electron-updater'
 import { join as pathJoin } from 'path'
 import pjson from '../package.json'
+import Settings from 'electron-settings'
 import './report'
 import rootDir from 'app-root-dir'
 import setupTrayIcon from './setup-tray-icon'
@@ -24,6 +25,7 @@ import {
 
 import LoadingWindow from './windows/Loading/window'
 import StorageWindow from './windows/Storage/window'
+import WelcomeWindow from './windows/Welcome/window'
 
 // Let's create the main window
 app.mainWindow = null
@@ -72,7 +74,18 @@ function askWhichNodeToUse (apiVersion) {
   return btnId === 1
 }
 
-app.on('ready', () => {
+/**
+ * This method will:
+ *  1. setup the tray icon (except on macOS)
+ *  2. check for updates
+ *  3. show loading window
+ *  4. check if an API is already running
+ *  5. start the daemon if not
+ *  6. connect to the API
+ *  7. connect to the Siderus peers (and add them as bootstrap nodes)
+ *  8. show storage window
+ */
+function startOrion () {
   // On MacOS it's expected for the app not to close, and to re-open it from Launchpad
   if (process.platform !== 'darwin') {
     setupTrayIcon()
@@ -238,6 +251,28 @@ app.on('ready', () => {
         app.quit()
       })
   })
+}
+
+app.on('start-orion', () => {
+  startOrion()
+})
+
+app.on('ready', () => {
+  const userAgreement = Settings.getSync('userAgreement')
+
+  if (userAgreement) {
+    startOrion()
+  } else {
+    // If the user did not accept our ToS, show the welcome window
+    const welcomeWindow = WelcomeWindow.create(app)
+    welcomeWindow.on('closed', () => {
+      // If the user did not accept ToS, but closed the welcome window, quit (don't run the the bg)
+      const userAgreement = Settings.getSync('userAgreement')
+      if (!userAgreement) {
+        app.quit()
+      }
+    })
+  }
 })
 
 app.on('activate', () => {
diff --git a/app/windows/Welcome/Components/TermsOfServicePage.jsx b/app/windows/Welcome/Components/TermsOfServicePage.jsx
new file mode 100644
index 0000000..56d7673
--- /dev/null
+++ b/app/windows/Welcome/Components/TermsOfServicePage.jsx
@@ -0,0 +1,89 @@
+import React from 'react'
+import styled from 'styled-components'
+import ToS from './ToS'
+import { shell } from 'electron'
+
+import {
+  Window,
+  Content,
+  Toolbar,
+  Actionbar,
+  Button,
+  CheckBox
+} from 'react-photonkit'
+
+const StyledContent = styled.div`
+  h1:first-child {
+    margin-top: 0px;
+  }
+`
+
+const TermsSection = styled.section`
+  background: white;
+  height: calc(100vh - 250px);
+  overflow: auto;
+  padding: 0px 10px;
+`
+
+const ToSLink = <a onClick={() => shell.openExternal('https://siderus.io/tos.html')} href='#'>Siderus Terms of Service</a>
+const PrivacyLink = <a onClick={() => shell.openExternal('https://siderus.io/privacy')} href='#'>Privacy policy</a>
+const checkboxLabel = <span>I have read and I agree to {ToSLink} and {PrivacyLink}</span>
+
+class TermsOfServicePage extends React.Component {
+  state = {
+    checked: false
+  }
+
+  handleCheckChange = () => {
+    this.setState(prevState => ({ checked: !prevState.checked }))
+  }
+
+  handleSubmit = (event) => {
+    event.preventDefault()
+    if (!this.state.checked) return
+
+    this.props.onAccept()
+  }
+
+  render () {
+    const { onQuit } = this.props
+    const { checked } = this.state
+
+    return (
+      <form onSubmit={this.handleSubmit}>
+        <Window>
+          <Content>
+            <StyledContent>
+              <h1>Terms of Service</h1>
+              <p>In order to continue, you need to accept the Terms of Service:</p>
+              <TermsSection>
+                <ToS />
+              </TermsSection>
+              <CheckBox
+                label={checkboxLabel}
+                checked={checked}
+                onChange={this.handleCheckChange}
+              />
+            </StyledContent>
+          </Content>
+          <Toolbar ptType="footer">
+            <Actionbar>
+              <Button text="Quit" ptStyle="default" onClick={onQuit} />
+              {
+                checked &&
+                <Button
+                  text="Done"
+                  ptStyle="primary"
+                  type="submit"
+                  pullRight
+                />
+              }
+            </Actionbar>
+          </Toolbar>
+        </Window>
+      </form>
+    )
+  }
+}
+
+export default TermsOfServicePage
diff --git a/app/windows/Welcome/Components/ToS.jsx b/app/windows/Welcome/Components/ToS.jsx
new file mode 100644
index 0000000..6865601
--- /dev/null
+++ b/app/windows/Welcome/Components/ToS.jsx
@@ -0,0 +1,31 @@
+import React from 'react'
+import request from 'request-promise-native'
+import Spinner from 'react-spin'
+
+class ToS extends React.Component {
+  state = {}
+
+  constructor () {
+    super()
+    this.fetchContent()
+  }
+
+  fetchContent = () => {
+    request({ uri: 'https://siderus.io/tos.html' })
+      .then(res => this.setState({ tos: res }))
+      .catch(err => {
+        console.error(err)
+        throw err
+      })
+  }
+
+  render () {
+    return (
+      this.state.tos
+        ? <div dangerouslySetInnerHTML={{ __html: this.state.tos }} />
+        : <Spinner />
+    )
+  }
+}
+
+export default ToS
diff --git a/app/windows/Welcome/Components/WelcomePage.jsx b/app/windows/Welcome/Components/WelcomePage.jsx
new file mode 100644
index 0000000..70dd362
--- /dev/null
+++ b/app/windows/Welcome/Components/WelcomePage.jsx
@@ -0,0 +1,38 @@
+import React from 'react'
+import OrionLogo from '../../../../docs/logo.svg'
+import styled from 'styled-components'
+
+import {
+  Window,
+  Content,
+  Toolbar,
+  Actionbar,
+  Button
+} from 'react-photonkit'
+
+const Centered = styled.div`
+  text-align: center !important;
+`
+
+function WelcomePage ({ onNext }) {
+  return (
+    <Window>
+      <Content>
+        <Centered>
+          <OrionLogo width='150px' />
+          <h1>Siderus Orion</h1>
+          <h3>Welcome</h3>
+          <p>Siderus Orion is the easiest way to start using the decentralised web with IPFS and Siderus Network. It supports a larger number of dApps as wel as the IPFS Browser Companion, to speed up your connection when surfing the decentralised web.</p>
+          <p>This wizard will help you with the initial requirements.</p>
+        </Centered>
+      </Content>
+      <Toolbar ptType="footer">
+        <Actionbar>
+          <Button text="Next" ptStyle="primary" onClick={onNext} pullRight />
+        </Actionbar>
+      </Toolbar>
+    </Window>
+  )
+}
+
+export default WelcomePage
diff --git a/app/windows/Welcome/index.html b/app/windows/Welcome/index.html
new file mode 100644
index 0000000..5483c2c
--- /dev/null
+++ b/app/windows/Welcome/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <title>Welcome</title>
+  <style>
+  .window-content {
+    padding: 24px !important;
+    display: initial !important;
+    background-color: rgb(236, 236, 236) !important;
+  }
+  </style>
+</head>
+
+<body>
+  <div id="host"></div>
+</body>
+
+<!-- Electron Javascript -->
+<script src="loader.js" charset="utf-8"></script>
+</html>
diff --git a/app/windows/Welcome/loader.js b/app/windows/Welcome/loader.js
new file mode 100644
index 0000000..3a1e460
--- /dev/null
+++ b/app/windows/Welcome/loader.js
@@ -0,0 +1,7 @@
+import Spinner from 'spin.js'
+
+var target = document.getElementById('host')
+new Spinner().spin(target)
+
+// After the spinner is rendered, we require the actual component
+setTimeout(() => require('./renderer.jsx'), 0)
diff --git a/app/windows/Welcome/renderer.jsx b/app/windows/Welcome/renderer.jsx
new file mode 100644
index 0000000..f1b596e
--- /dev/null
+++ b/app/windows/Welcome/renderer.jsx
@@ -0,0 +1,39 @@
+import React from 'react'
+import ReactDom from 'react-dom'
+
+import WelcomePage from './Components/WelcomePage'
+import TermsOfServicePage from './Components/TermsOfServicePage'
+import { remote } from 'electron'
+import Settings from 'electron-settings'
+
+class WelcomeWindow extends React.Component {
+  state = {
+    page: 0
+  }
+
+  handleNext = () => {
+    this.setState({ page: 1 })
+  }
+
+  handleQuit = () => {
+    window.close()
+  }
+
+  handleAccept = () => {
+    Settings.setSync('userAgreement', true)
+    remote.app.emit('start-orion')
+    window.close()
+  }
+
+  render () {
+    const { page } = this.state
+
+    return (
+      page === 0
+        ? <WelcomePage onNext={this.handleNext} />
+        : <TermsOfServicePage onQuit={this.handleQuit} onAccept={this.handleAccept} />
+    )
+  }
+}
+
+ReactDom.render(<WelcomeWindow />, document.querySelector('#host'))
diff --git a/app/windows/Welcome/window.js b/app/windows/Welcome/window.js
new file mode 100644
index 0000000..c34a746
--- /dev/null
+++ b/app/windows/Welcome/window.js
@@ -0,0 +1,70 @@
+/**
+ * This window will prompt the user with the a short description about Orion
+ * and with the Terms of Service which need to be read and accepted
+ */
+
+import path from 'path'
+import url from 'url'
+
+import { BrowserWindow, remote } from 'electron'
+
+import isRenderer from 'is-electron-renderer'
+
+// Allow us to use create() in both electron windows and main process
+let BrowserWindowClass
+if (isRenderer) {
+  BrowserWindowClass = remote.BrowserWindow
+} else {
+  BrowserWindowClass = BrowserWindow
+}
+
+module.exports = {}
+
+module.exports.create = function createResolveIPNSWindow (app) {
+  // Create the browser modal window.
+  let thisWindow = new BrowserWindowClass({
+    title: 'Welcome',
+    parent: app.mainWindow,
+    modal: true,
+
+    width: 600,
+    minWidth: 600,
+    height: 600,
+    minHeight: 600,
+
+    maximizable: false,
+    resizable: true,
+    fullscreenable: false,
+    icon: path.join(__dirname, '../../../docs/logo.png'),
+
+    show: false,
+    webPreferences: {
+      preload: path.join(__dirname, '../../report.js')
+    }
+  })
+
+  // Show menu only on StorageList
+  thisWindow.setMenu(null)
+
+  // Show the window only when ready
+  thisWindow.once('ready-to-show', () => {
+    thisWindow.show()
+  })
+
+  // Load the index.html of the app.
+  thisWindow.loadURL(url.format({
+    pathname: path.join(__dirname, 'index.html'),
+    protocol: 'file:',
+    slashes: true
+  }))
+
+  // Emitted when the window is closed.
+  thisWindow.on('closed', () => {
+    // Dereference the window object, usually you would store windows
+    // in an array if your app supports multi windows, this is the time
+    // when you should delete the corresponding element.
+    thisWindow = null
+  })
+
+  return thisWindow
+}