diff --git a/common/app/App.jsx b/common/app/App.jsx
index a0839db4aa..f8494c14c8 100644
--- a/common/app/App.jsx
+++ b/common/app/App.jsx
@@ -130,7 +130,7 @@ export class FreeCodeCamp extends React.Component {
         bsStyle='primary'
         className='animated fadeIn'
         onClick={ submitChallenge }
-      >
+        >
         Submit and go to my next challenge
       </Button>
     );
@@ -170,7 +170,8 @@ export class FreeCodeCamp extends React.Component {
         <ToastContainer
           className='toast-bottom-right'
           ref='toaster'
-          toastMessageFactory={ toastMessageFactory } />
+          toastMessageFactory={ toastMessageFactory }
+        />
       </div>
     );
   }
diff --git a/common/app/routes/challenges/components/classic/Classic.jsx b/common/app/routes/challenges/components/classic/Classic.jsx
index 264126f29e..b3a8a2c283 100644
--- a/common/app/routes/challenges/components/classic/Classic.jsx
+++ b/common/app/routes/challenges/components/classic/Classic.jsx
@@ -66,7 +66,8 @@ export class Challenge extends PureComponent {
     return (
       <Col
         lg={ 3 }
-        md={ 4 }>
+        md={ 4 }
+        >
         <Preview />
       </Col>
     );
@@ -85,12 +86,14 @@ export class Challenge extends PureComponent {
       <div>
         <Col
           lg={ 3 }
-          md={ showPreview ? 3 : 4 }>
+          md={ showPreview ? 3 : 4 }
+          >
           <SidePanel />
         </Col>
         <Col
           lg={ showPreview ? 6 : 9 }
-          md={ showPreview ? 5 : 8 }>
+          md={ showPreview ? 5 : 8 }
+          >
           <Editor
             content={ content }
             executeChallenge={ executeChallenge }
diff --git a/common/app/routes/challenges/components/classic/Side-Panel.jsx b/common/app/routes/challenges/components/classic/Side-Panel.jsx
index 263f8c3760..ef1c6c3f3a 100644
--- a/common/app/routes/challenges/components/classic/Side-Panel.jsx
+++ b/common/app/routes/challenges/components/classic/Side-Panel.jsx
@@ -9,25 +9,31 @@ import TestSuite from './Test-Suite.jsx';
 import Output from './Output.jsx';
 import ToolPanel from './Tool-Panel.jsx';
 import { challengeSelector } from '../../redux/selectors';
+import { updateHint, executeChallenge } from '../../redux/actions';
+import { makeToast } from '../../../../redux/actions';
 
+const bindableActions = { makeToast, executeChallenge, updateHint };
 const mapStateToProps = createSelector(
   challengeSelector,
   state => state.app.windowHeight,
   state => state.app.navHeight,
   state => state.challengesApp.tests,
   state => state.challengesApp.output,
+  state => state.challengesApp.hintIndex,
   (
-    { challenge: { title, description } = {} },
+    { challenge: { title, description, hints = [] } = {} },
     windowHeight,
     navHeight,
     tests,
-    output
+    output,
+    hintIndex
   ) => ({
     title,
     description,
     height: windowHeight - navHeight - 20,
     tests,
-    output
+    output,
+    hint: hints[hintIndex]
   })
 );
 
@@ -43,7 +49,10 @@ export class SidePanel extends PureComponent {
     height: PropTypes.number,
     tests: PropTypes.arrayOf(PropTypes.object),
     title: PropTypes.string,
-    output: PropTypes.string
+    output: PropTypes.string,
+    hints: PropTypes.string,
+    updateHint: PropTypes.func,
+    makeToast: PropTypes.func
   };
 
   renderDescription(description = [ 'Happy Coding!' ], descriptionRegex) {
@@ -52,14 +61,16 @@ export class SidePanel extends PureComponent {
         return (
           <div
             dangerouslySetInnerHTML={{ __html: line }}
-            key={ line.slice(-6) + index } />
+            key={ line.slice(-6) + index }
+          />
         );
       }
       return (
         <p
           className='wrappable'
           dangerouslySetInnerHTML= {{ __html: line }}
-          key={ line.slice(-6) + index }/>
+          key={ line.slice(-6) + index }
+        />
       );
     });
   }
@@ -70,7 +81,11 @@ export class SidePanel extends PureComponent {
       description,
       height,
       tests = [],
-      output
+      output,
+      hint,
+      executeChallenge,
+      updateHint,
+      makeToast
     } = this.props;
     const style = {
       overflowX: 'hidden',
@@ -82,7 +97,8 @@ export class SidePanel extends PureComponent {
     return (
       <div
         ref='panel'
-        style={ style }>
+        style={ style }
+        >
         <div>
           <h4 className='text-center challenge-instructions-title'>
             { title || 'Happy Coding!' }
@@ -91,12 +107,18 @@ export class SidePanel extends PureComponent {
           <Row>
             <Col
               className='challenge-instructions'
-              xs={ 12 }>
+              xs={ 12 }
+              >
               { this.renderDescription(description, this.descriptionRegex) }
             </Col>
           </Row>
         </div>
-        <ToolPanel />
+        <ToolPanel
+          executeChallenge={ executeChallenge }
+          hint={ hint }
+          makeToast={ makeToast }
+          updateHint={ updateHint }
+        />
         <Output output={ output }/>
         <br />
         <TestSuite tests={ tests } />
@@ -105,4 +127,7 @@ export class SidePanel extends PureComponent {
   }
 }
 
-export default connect(mapStateToProps)(SidePanel);
+export default connect(
+  mapStateToProps,
+  bindableActions
+)(SidePanel);
diff --git a/common/app/routes/challenges/components/classic/Test-Suite.jsx b/common/app/routes/challenges/components/classic/Test-Suite.jsx
index ad002013e7..9691db5746 100644
--- a/common/app/routes/challenges/components/classic/Test-Suite.jsx
+++ b/common/app/routes/challenges/components/classic/Test-Suite.jsx
@@ -25,13 +25,15 @@ export default class extends PureComponent {
         <Row key={ text.slice(-6) + index }>
           <Col
             className='text-center'
-            xs={ 2 }>
+            xs={ 2 }
+            >
             <i className={ iconClass } />
           </Col>
           <Col
             className='test-output'
             dangerouslySetInnerHTML={{ __html: text }}
-            xs={ 10 } />
+            xs={ 10 }
+          />
         </Row>
       );
     });
@@ -42,7 +44,8 @@ export default class extends PureComponent {
     return (
       <div
         className='challenge-test-suite'
-        style={{ marginTop: '10px' }}>
+        style={{ marginTop: '10px' }}
+        >
         { this.renderTests(tests) }
       </div>
     );
diff --git a/common/app/routes/challenges/components/classic/Tool-Panel.jsx b/common/app/routes/challenges/components/classic/Tool-Panel.jsx
index 16f9e95f22..3dbbe05b54 100644
--- a/common/app/routes/challenges/components/classic/Tool-Panel.jsx
+++ b/common/app/routes/challenges/components/classic/Tool-Panel.jsx
@@ -1,23 +1,48 @@
 import React, { PropTypes } from 'react';
-import { connect } from 'react-redux';
 import { Button, ButtonGroup } from 'react-bootstrap';
 import PureComponent from 'react-pure-render/component';
 
-import { executeChallenge } from '../../redux/actions';
-
-const bindableActions = { executeChallenge };
-
-export class ToolPanel extends PureComponent {
+export default class ToolPanel extends PureComponent {
+  constructor(...props) {
+    super(...props);
+    this.makeHint = this.makeHint.bind(this);
+  }
   static displayName = 'ToolPanel';
 
   static propTypes = {
-    executeChallenge: PropTypes.func
+    executeChallenge: PropTypes.func,
+    updateHint: PropTypes.func,
+    hint: PropTypes.string
   };
 
+  makeHint() {
+    this.props.makeToast({
+      message: this.props.hint
+    });
+    this.props.updateHint();
+  }
+
+  renderHint(hint, makeHint) {
+    if (!hint) {
+      return null;
+    }
+    return (
+      <Button
+        block={ true }
+        bsStyle='primary'
+        className='btn-big'
+        onClick={ makeHint }
+        >
+          Hint
+      </Button>
+    );
+  }
+
   render() {
-    const { executeChallenge } = this.props;
+    const { hint, executeChallenge } = this.props;
     return (
       <div>
+        { this.renderHint(hint, this.makeHint) }
         <Button
           block={ true }
           bsStyle='primary'
@@ -58,5 +83,3 @@ export class ToolPanel extends PureComponent {
     );
   }
 }
-
-export default connect(null, bindableActions)(ToolPanel);
diff --git a/common/app/routes/challenges/redux/actions.js b/common/app/routes/challenges/redux/actions.js
index 27985c93de..550adc1c4a 100644
--- a/common/app/routes/challenges/redux/actions.js
+++ b/common/app/routes/challenges/redux/actions.js
@@ -19,6 +19,7 @@ export const fetchChallengeCompleted = createAction(
   entities => ({ entities })
 );
 export const resetUi = createAction(types.resetUi);
+export const updateHint = createAction(types.updateHint);
 
 export const fetchChallenges = createAction(types.fetchChallenges);
 export const fetchChallengesCompleted = createAction(
diff --git a/common/app/routes/challenges/redux/reducer.js b/common/app/routes/challenges/redux/reducer.js
index c56b4828ef..d9543b3ead 100644
--- a/common/app/routes/challenges/redux/reducer.js
+++ b/common/app/routes/challenges/redux/reducer.js
@@ -12,6 +12,7 @@ import {
 } from '../utils';
 
 const initialUiState = {
+  hintIndex: 0,
   // step index tracing
   currentIndex: 0,
   previousIndex: -1,
@@ -64,12 +65,19 @@ const mainReducer = handleActions(
       legacyKey: challenge.name,
       challenge: challenge.dashedName,
       key: getFileKey(challenge),
-      tests: createTests(challenge)
+      tests: createTests(challenge),
+      numOfHints: Array.isArray(challenge.hints) ? challenge.hints.length : 0
     }),
     [types.updateTests]: (state, { payload: tests }) => ({
       ...state,
       tests
     }),
+    [types.updateHint]: state => ({
+      ...state,
+      hintIndex: state.hintIndex + 1 >= state.numOfHints ?
+        0 :
+        state.hintIndex + 1
+    }),
     [types.executeChallenge]: state => ({
       ...state,
       tests: state.tests.map(test => ({ ...test, err: false, pass: false }))
diff --git a/common/app/routes/challenges/redux/types.js b/common/app/routes/challenges/redux/types.js
index 141b96ce5f..e786c8b55b 100644
--- a/common/app/routes/challenges/redux/types.js
+++ b/common/app/routes/challenges/redux/types.js
@@ -13,6 +13,7 @@ export default createTypes([
   'updateCurrentChallenge',
   'replaceChallenge',
   'resetUi',
+  'updateHint',
 
   // map
   'updateFilter',
diff --git a/common/models/challenge.json b/common/models/challenge.json
index f123911b36..78fa8a8364 100644
--- a/common/models/challenge.json
+++ b/common/models/challenge.json
@@ -51,6 +51,11 @@
       "type": "number",
       "description": "Used to determine super block order, set by prepending two digit number to super block folder name"
     },
+    "hint": {
+      "type": "array",
+      "default": [],
+      "description": "hints must be a single line of plain text"
+    },
     "block": {
       "type": "string"
     },
diff --git a/seed/challenges/01-front-end-development-certification/intermediate-bonfires.json b/seed/challenges/01-front-end-development-certification/intermediate-bonfires.json
index a9f583f6f8..6e89f82e5c 100644
--- a/seed/challenges/01-front-end-development-certification/intermediate-bonfires.json
+++ b/seed/challenges/01-front-end-development-certification/intermediate-bonfires.json
@@ -19,6 +19,11 @@
         "",
         "sumAll([1, 4]);"
       ],
+      "hints": [
+        "Use Math.max() to find the maximum value of two numbers.",
+        "Use Math.min() to find the minimum value of two numbers.",
+        "Remember to that you must add all the numbers in between so this would require a way to get those numbers."
+      ],
       "solutions": [
         "function sumAll(arr) {\n  var sum = 0;\n  arr.sort(function(a,b) {return a-b;});\n  for (var i = arr[0]; i <= arr[1]; i++) {\n    sum += i; \n  }\n  return sum;\n}"
       ],