diff --git a/lib/controllers/git-controller.js b/lib/controllers/git-controller.js
index a47276a74e..4a36982f94 100644
--- a/lib/controllers/git-controller.js
+++ b/lib/controllers/git-controller.js
@@ -10,6 +10,7 @@ import StatusBar from '../views/status-bar';
 import Panel from '../views/panel';
 import PaneItem from '../views/pane-item';
 import Resizer from '../views/resizer';
+import Tabs from '../views/tabs';
 import Commands, {Command} from '../views/commands';
 import FilePatchController from './file-patch-controller';
 import GitPanelController from './git-panel-controller';
@@ -31,10 +32,12 @@ export default class GitController extends React.Component {
     repository: React.PropTypes.object,
     statusBar: React.PropTypes.object,
     savedState: React.PropTypes.object,
+    githubEnabled: React.PropTypes.bool,
   }
 
   static defaultProps = {
     savedState: {},
+    githubEnabled: false,
   }
 
   serialize() {
@@ -51,6 +54,7 @@ export default class GitController extends React.Component {
       amending: false,
       gitPanelActive: !!props.savedState.gitPanelActive,
       panelSize: props.savedState.panelSize || 400,
+      activeTab: 0,
     };
 
     this.repositoryStateRegistry = new ModelStateRegistry(GitController, {
@@ -123,27 +127,36 @@ export default class GitController extends React.Component {
           size={this.state.panelSize}
           onChange={this.handlePanelResize}
           className="github-PanelResizer">
-          <EtchWrapper
-            ref={c => { this.gitPanelController = c; }}
-            className="github-PanelEtchWrapper"
-            reattachDomNode={false}>
-            <GitPanelController
-              workspace={this.props.workspace}
-              commandRegistry={this.props.commandRegistry}
-              notificationManager={this.props.notificationManager}
-              repository={this.props.repository}
-              isAmending={this.state.amending}
-              didSelectFilePath={this.showFilePatchForPath}
-              didDiveIntoFilePath={this.diveIntoFilePatchForPath}
-              didSelectMergeConflictFile={this.showMergeConflictFileForPath}
-              didDiveIntoMergeConflictPath={this.diveIntoMergeConflictFileForPath}
-              didChangeAmending={this.didChangeAmending}
-              focusFilePatchView={this.focusFilePatchView}
-              ensureGitPanel={this.ensureGitPanel}
-              openFiles={this.openFiles}
-              discardWorkDirChangesForPaths={this.discardWorkDirChangesForPaths}
-            />
-          </EtchWrapper>
+          <Tabs activeIndex={this.state.activeTab} onChange={this.handleChangeTab} className="sidebar-tabs">
+            <Tabs.Panel title="Git">
+              <EtchWrapper
+                ref={c => { this.gitPanelController = c; }}
+                className="github-PanelEtchWrapper"
+                reattachDomNode={false}>
+                <GitPanelController
+                  workspace={this.props.workspace}
+                  commandRegistry={this.props.commandRegistry}
+                  notificationManager={this.props.notificationManager}
+                  repository={this.props.repository}
+                  isAmending={this.state.amending}
+                  didSelectFilePath={this.showFilePatchForPath}
+                  didDiveIntoFilePath={this.diveIntoFilePatchForPath}
+                  didSelectMergeConflictFile={this.showMergeConflictFileForPath}
+                  didDiveIntoMergeConflictPath={this.diveIntoMergeConflictFileForPath}
+                  didChangeAmending={this.didChangeAmending}
+                  focusFilePatchView={this.focusFilePatchView}
+                  ensureGitPanel={this.ensureGitPanel}
+                  openFiles={this.openFiles}
+                  discardWorkDirChangesForPaths={this.discardWorkDirChangesForPaths}
+                />
+              </EtchWrapper>
+            </Tabs.Panel>
+            {this.props.githubEnabled && (
+              <Tabs.Panel title="Hub">
+                Hello from Hub
+              </Tabs.Panel>
+            )}
+          </Tabs>
         </Resizer>
       </Panel>
     );
@@ -315,4 +328,8 @@ export default class GitController extends React.Component {
     return this.props.repository.discardWorkDirChangesForPaths(filePaths);
   }
 
+  @autobind
+  handleChangeTab(activeTab) {
+    this.setState({activeTab});
+  }
 }
diff --git a/lib/git-shell-out-strategy.js b/lib/git-shell-out-strategy.js
index 5457e5f05b..50c2788298 100644
--- a/lib/git-shell-out-strategy.js
+++ b/lib/git-shell-out-strategy.js
@@ -57,6 +57,7 @@ export default class GitShellOutStrategy {
         processCallback: child => {
           child.on('error', err => {
             console.error('Error executing: ' + formattedArgs);
+
             console.error(err.stack);
           });
           child.stdin.on('error', err => {
diff --git a/lib/github-package.js b/lib/github-package.js
index 60f46e4130..cb93c56659 100644
--- a/lib/github-package.js
+++ b/lib/github-package.js
@@ -14,11 +14,12 @@ import FilePatchController from './controllers/file-patch-controller';
 import GitController from './controllers/git-controller';
 
 export default class GithubPackage {
-  constructor(workspace, project, commandRegistry, notificationManager) {
+  constructor(workspace, project, commandRegistry, notificationManager, config) {
     this.workspace = workspace;
     this.project = project;
     this.commandRegistry = commandRegistry;
     this.notificationManager = notificationManager;
+    this.config = config;
     this.repositoriesAndChangeObserversByProjectPath = new Map();
     this.activeRepository = null;
     this.subscriptions = new CompositeDisposable();
@@ -33,6 +34,7 @@ export default class GithubPackage {
     this.subscriptions.add(
       this.project.onDidChangePaths(this.didChangeProjectPaths),
       this.workspace.onDidChangeActivePaneItem(this.didChangeActivePaneItem),
+      this.config.onDidChange('github.githubEnabled', this.rerender),
     );
     if (state.activeRepositoryPath) {
       const repository = await this.getRepositoryForWorkdirPath(state.activeRepositoryPath);
@@ -51,6 +53,7 @@ export default class GithubPackage {
     };
   }
 
+  @autobind
   rerender() {
     if (!this.element) {
       this.element = document.createElement('div');
@@ -69,6 +72,7 @@ export default class GithubPackage {
         repository={this.getActiveRepository()}
         statusBar={this.statusBar}
         savedState={this.savedState.gitController}
+        githubEnabled={this.config.get('github.githubEnabled')}
       />, this.element,
     );
   }
diff --git a/lib/index.js b/lib/index.js
index bdcdc1b900..931ef44f4d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -28,6 +28,6 @@ function startPackage() {
   var GithubPackage = require('./github-package').default;
 
   return new GithubPackage(
-    atom.workspace, atom.project, atom.commands, atom.notifications,
+    atom.workspace, atom.project, atom.commands, atom.notifications, atom.config,
   );
 }
diff --git a/lib/views/tabs.js b/lib/views/tabs.js
new file mode 100644
index 0000000000..8153fd60d1
--- /dev/null
+++ b/lib/views/tabs.js
@@ -0,0 +1,95 @@
+import React from 'react';
+import cx from 'classnames';
+import {autobind} from 'core-decorators';
+
+function getClasses(staticClasses, active) {
+  return cx(...staticClasses, {
+    inactive: !active,
+    active,
+  });
+}
+
+class TabsNavigationItem extends React.Component {
+  static propTypes = {
+    title: React.PropTypes.node,
+    tabIndex: React.PropTypes.number.isRequired,
+    active: React.PropTypes.bool,
+    onClick: React.PropTypes.func,
+  }
+
+  render() {
+    const classes = getClasses(['github-Tabs-NavigationItem'], this.props.active);
+    return (
+      <div className={classes} onClick={this.handleClick}>
+        {this.props.title}
+      </div>
+    );
+  }
+
+  @autobind
+  handleClick() {
+    this.props.onClick(this.props.tabIndex);
+  }
+}
+
+export default class Tabs extends React.Component {
+  static propTypes = {
+    className: React.PropTypes.string,
+    activeIndex: React.PropTypes.number.isRequired,
+    children: React.PropTypes.node,
+    onChange: React.PropTypes.func,
+  }
+
+  static defaultProps = {
+    className: '',
+    onChange: () => {},
+  }
+
+  render() {
+    const children = React.Children.toArray(this.props.children).filter(v => !!v);
+    return (
+      <div className={cx('github-Tabs', this.props.className)} data-tabs-count={children.length}>
+        <nav className="github-Tabs-NavigationContainer">
+          {children.map((child, i) => child && (
+            <TabsNavigationItem
+              key={i}
+              title={child.props.title}
+              active={this.props.activeIndex === i}
+              tabIndex={i}
+              onClick={this.props.onChange}
+            />
+          ))}
+        </nav>
+        <section className="github-Tabs-PanelContainer">
+          {children.map((child, i) => child && (
+            React.cloneElement(child, {active: i === this.props.activeIndex})
+          ))}
+        </section>
+      </div>
+    );
+  }
+}
+
+Tabs.Panel = class TabPanel extends React.Component {
+  static propTypes = {
+    className: React.PropTypes.string,
+    active: React.PropTypes.bool,
+    children: React.PropTypes.node,
+    title: React.PropTypes.node,
+  }
+
+  static defaultProps = {
+    className: '',
+    active: false,
+  }
+
+  render() {
+    // eslint-disable-next-line no-unused-vars
+    const {active, children, className, title, ...others} = this.props;
+    return (
+      <div className={getClasses(['github-Tabs-Panel', className], this.props.active)} {...others}>
+        {this.props.children}
+      </div>
+    );
+  }
+};
diff --git a/styles/git-panel.less b/styles/git-panel.less
index 57e515839e..d9f75e2d35 100644
--- a/styles/git-panel.less
+++ b/styles/git-panel.less
@@ -1,10 +1,5 @@
 @import "variables";
 
-.github-PanelResizer {
-  // ok, yeah, magic number.. err color
-  background-color: mix(@base-background-color, @tool-panel-background-color);
-}
-
 .github-PanelEtchWrapper {
   height: 100%;
 }
diff --git a/styles/tabs.less b/styles/tabs.less
new file mode 100644
index 0000000000..d5a311e0a6
--- /dev/null
+++ b/styles/tabs.less
@@ -0,0 +1,82 @@
+@import "variables";
+
+// General Styles
+.github-Tabs {
+  &-Panel {
+    &.active {
+      display: block;
+    }
+
+    &.inactive {
+      display: none;
+    }
+  }
+}
+
+// App-specific styles
+.github-Tabs.sidebar-tabs {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .github-Tabs-NavigationContainer {
+    display: flex;
+    flex-direction: row;
+    padding: @component-padding;
+
+    .github-Tabs-NavigationItem {
+      flex: 1;
+      text-align: center;
+      cursor: pointer;
+      background-color: @button-background-color;
+      color: contrast(@button-background-color, hsla(0,0%,0%,.6), hsla(0,0%,100%,.6));
+      border: 1px solid @button-border-color;
+      padding: .25em .5em;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+
+      & + .github-Tabs-NavigationItem {
+        border-left: none;
+      }
+
+      &.active {
+        background-color: @button-background-color-selected;
+        color: contrast(@button-background-color-selected, hsla(0,0%,0%,1), hsla(0,0%,100%,1));
+      }
+
+      &:first-child {
+        border-top-left-radius: @component-border-radius;
+        border-bottom-left-radius: @component-border-radius;
+      }
+
+      &:last-child {
+        border-top-right-radius: @component-border-radius;
+        border-bottom-right-radius: @component-border-radius;
+      }
+    }
+
+  }
+
+  &[data-tabs-count="1"] {
+    .github-Tabs-NavigationContainer {
+      display: none;
+    }
+  }
+
+  .github-Tabs-PanelContainer {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .github-Tabs-Panel {
+    flex: 1;
+
+    &.active {
+    }
+
+    &.inactive {
+    }
+  }
+}
diff --git a/test/github-package.test.js b/test/github-package.test.js
index ff19658ca2..de81425e26 100644
--- a/test/github-package.test.js
+++ b/test/github-package.test.js
@@ -9,7 +9,7 @@ import {cloneRepository} from './helpers';
 import GithubPackage from '../lib/github-package';
 
 describe('GithubPackage', function() {
-  let atomEnv, workspace, project, commandRegistry, notificationManager, githubPackage;
+  let atomEnv, workspace, project, commandRegistry, notificationManager, config, githubPackage;
 
   beforeEach(function() {
     atomEnv = global.buildAtomEnvironment();
@@ -17,7 +17,8 @@ describe('GithubPackage', function() {
     project = atomEnv.project;
     commandRegistry = atomEnv.commands;
     notificationManager = atomEnv.notifications;
-    githubPackage = new GithubPackage(workspace, project, commandRegistry, notificationManager);
+    config = atomEnv.config;
+    githubPackage = new GithubPackage(workspace, project, commandRegistry, notificationManager, config);
   });
 
   afterEach(async function() {