diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..ba8dafd
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <JSCodeStyleSettings>
+          <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+          <option name="FORCE_SEMICOLON_STYLE" value="true" />
+          <option name="SPACE_BEFORE_GENERATOR_MULT" value="true" />
+          <option name="USE_DOUBLE_QUOTES" value="false" />
+          <option name="FORCE_QUOTE_STYlE" value="true" />
+          <option name="SPACES_WITHIN_IMPORTS" value="true" />
+        </JSCodeStyleSettings>
+        <codeStyleSettings language="JavaScript">
+          <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+          <option name="SPACE_BEFORE_METHOD_PARENTHESES" value="true" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
+          <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+          <indentOptions>
+            <option name="INDENT_SIZE" value="2" />
+            <option name="CONTINUATION_INDENT_SIZE" value="2" />
+            <option name="TAB_SIZE" value="2" />
+          </indentOptions>
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..c6cc8c8
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/HackMerced/2017F/src/app/src/actions/actions.js b/HackMerced/2017F/src/app/src/actions/actions.js
index e774c21..3f52cfc 100644
--- a/HackMerced/2017F/src/app/src/actions/actions.js
+++ b/HackMerced/2017F/src/app/src/actions/actions.js
@@ -24,11 +24,12 @@
  */
 
 
-import { SET_AUTH, UPDATE_LOGIN_FORM, UPDATE_USER_DATA, UPDATE_SIGNUP_FORM, UPDATE_SIGNUP_ERRORS, UPDATE_LOGIN_ERRORS, SET_AUTH_AS_FALSE, SET_USER_NAME_AS_FALSE, SET_USER_NAME, SET_USER_ID_AS_FALSE, SET_USER_ID, UPDATE_APPLY_STEP_ONE, UPDATE_APPLY_STEP_TWO, UPDATE_APPLY_STEP_THREE, UPDATE_APPLY_STEP_FOUR, SET_CURRENT_APPLY_STEP, UPDATE_USER_UPDATING_STATUS, UPDATE_APPLY_ERRORS, UPDATE_MOBILE_MENU_STATUS, UPDATE_SUBMITTED_VIEW,UPDATE_FORGOT_PASSWORD_FORM,UPDATE_VOLUNTEER_FORM } from '../constants';
+import { SET_AUTH, UPDATE_LOGIN_FORM, UPDATE_USER_DATA, UPDATE_SIGNUP_FORM, UPDATE_SIGNUP_ERRORS, UPDATE_LOGIN_ERRORS, UPDATE_VOLUNTEER_ERRORS, SET_AUTH_AS_FALSE, SET_USER_NAME_AS_FALSE, SET_USER_NAME, SET_USER_ID_AS_FALSE, SET_USER_ID, UPDATE_APPLY_STEP_ONE, UPDATE_APPLY_STEP_TWO, UPDATE_APPLY_STEP_THREE, UPDATE_APPLY_STEP_FOUR, SET_CURRENT_APPLY_STEP, UPDATE_USER_UPDATING_STATUS, UPDATE_APPLY_ERRORS, UPDATE_MOBILE_MENU_STATUS, UPDATE_SUBMITTED_VIEW,UPDATE_FORGOT_PASSWORD_FORM,UPDATE_VOLUNTEER_FORM } from '../constants';
 import { auth } from '../util';
 
 import { browserHistory } from 'react-router';
 import { notMercedOptions } from '../constants'
+import { parseError } from '../util'
 
 function mapUserDetailsToApplication(dispatch, details){
   let stepOne = {
@@ -186,6 +187,41 @@ export function logout() {
   }
 }
 
+/**
+ *
+ * @param user
+ * @returns {function(*)}
+ */
+export function signUpVolunteer (user) {
+  return (dispatch) => {
+    auth.submitVolunteerApplication(user)
+      .then(() => {
+        dispatch(updateVolunteerForm({
+          name: '',
+          email: '',
+          age: '',
+          friday_availability: '',
+          saturday_availability: '',
+          sunday_availability: '',
+          dietary_restrictions: '',
+          shirt_size: '',
+        }))
+
+        forwardTo('/')
+      })
+      .catch(({ validation }) => {
+        let errorSet = {}
+        if(validation.errors) {
+          validation.errors.forEach((error) => {
+            errorSet[error.key] = parseError(error.key, error.message);
+          })
+        }
+
+        dispatch(updateVolunteerErrors(errorSet));
+    });
+  }
+}
+
 export function signup(user) {
    return (dispatch) => {
 
@@ -216,6 +252,8 @@ export function signup(user) {
    }
  }
 
+
+
 export function updateApplyStep(index, data){
   const applyStepMap = [
     updateApplyStepOne(data),
@@ -268,6 +306,11 @@ export function updateSignupErrors(newState) {
   return { type: UPDATE_SIGNUP_ERRORS, newState };
 }
 
+
+export function updateVolunteerErrors(newState) {
+  return { type: UPDATE_VOLUNTEER_ERRORS, newState };
+}
+
 export function updateApplyErrors(newState) {
   return { type: UPDATE_APPLY_ERRORS, newState };
 }
diff --git a/HackMerced/2017F/src/app/src/components/application/layout.js b/HackMerced/2017F/src/app/src/components/application/layout.js
index f2a4800..dae343d 100644
--- a/HackMerced/2017F/src/app/src/components/application/layout.js
+++ b/HackMerced/2017F/src/app/src/components/application/layout.js
@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import { TextInputBlock } from '../partials';
 import { updateApplyStep, update, updateApplyErrors } from '../../actions';
 import { StepOne, StepTwo, StepThree, StepFour } from './';
 import { notMercedOptions } from '../../constants';
@@ -9,7 +8,6 @@ let timeChecker;
 
 export class ApplicationLayout extends Component {
 
-
   render() {
     return (
       <div className='application'>
@@ -85,7 +83,7 @@ export class ApplicationLayout extends Component {
     const { data } = this.props;
     const { name, value } = event.target;
     let newState = {};
-    let newErrorState = {}
+    let newErrorState = {};
 
     newErrorState = assign(data.applyErrors, {
        [ name ]: undefined
diff --git a/HackMerced/2017F/src/app/src/components/application/step-three.js b/HackMerced/2017F/src/app/src/components/application/step-three.js
index 4d5c4af..d195696 100644
--- a/HackMerced/2017F/src/app/src/components/application/step-three.js
+++ b/HackMerced/2017F/src/app/src/components/application/step-three.js
@@ -7,7 +7,7 @@ export class StepThree extends Component {
 
 
   render() {
-    const { resume, question, experience, dietary_restrictions, allergies, github, linkedin, devpost } = this.props.data;
+    const { resume, experience, dietary_restrictions, allergies, github, linkedin, devpost } = this.props.data;
 
     return (
       <div id='applyForm-3'>
diff --git a/HackMerced/2017F/src/app/src/components/forms/index.js b/HackMerced/2017F/src/app/src/components/forms/index.js
index 532a3ab..66e84b1 100644
--- a/HackMerced/2017F/src/app/src/components/forms/index.js
+++ b/HackMerced/2017F/src/app/src/components/forms/index.js
@@ -1,4 +1,5 @@
 export * from './signup';
 export * from './login';
-export *from'./forget';
-export *from'./volunteer';
\ No newline at end of file
+export * from './forget';
+export * from './volunteer';
+
diff --git a/HackMerced/2017F/src/app/src/components/forms/volunteer.js b/HackMerced/2017F/src/app/src/components/forms/volunteer.js
index f616b25..b1ee995 100644
--- a/HackMerced/2017F/src/app/src/components/forms/volunteer.js
+++ b/HackMerced/2017F/src/app/src/components/forms/volunteer.js
@@ -13,53 +13,47 @@ import { signUpVolunteer, updateVolunteerForm } from '../../actions';
 const assign = Object.assign || require('object.assign');
 
 export class VolunteerForm extends Component {
-  
+
   render() {
+    const { errors, data } = this.props;
+
     return (
       <form onChange={this._onChange.bind(this)} onSubmit={this._onSubmit.bind(this)} >
-        <h3>Volunteer for HackMerced</h3>
+        <h3>Interested in helping out HackMerced?</h3>
+        <h3> Become a volunteer!</h3>
         <TextInputBlock
-          error={this.props.errors.name}
-          value={this.props.data.name}
+          error={errors.name}
+          value={data.name}
           name='name'
           type='text'
           label='Name'
           placeholder='Your Full Name' autoCorrect="off" autoCapitalize="off" spellCheck="false"/>
 
         <TextInputBlock
-          error={this.props.errors.email}
-          value={this.props.data.email}
+          error={errors.email}
+          value={data.email}
           name='email'
           type='text'
           label='Email'
           placeholder='Your Email' autoCorrect="off" autoCapitalize="off" spellCheck="false"/>
 
         <TextInputBlock
-          error={this.props.errors.age}
-          value={this.props.data.age}
+          error={errors.age}
+          value={data.age}
           name='age'
           type='number'
           label='Age'
           placeholder='Your Age' autoCorrect="off" autoCapitalize="off" spellCheck="false"/>
 
         <TextInputBlock
-          error={this.props.errors.availibility}
-          value={this.props.data.availibility}
-          name='availibility'
-          type='text'
-          label='Availability'
-          helper='In order to be eligable for free HackMerced goodies, you must volunteer for a minimum of 3 hours'
-          placeholder='Availability Hours' autoCorrect="off" autoCapitalize="off" spellCheck="false"/>
-
-        <TextInputBlock
-          value={this.props.data.dietary_restrictions}
-          error={this.props.errors.dietary_restrictions}
+          value={data.dietary_restrictions}
+          error={errors.dietary_restrictions}
           label='Do you have any dietary restrictions?'
           labelType='large'
           name='dietary_restrictions'
           type='options'
           optionsType='small'
-          onChange={this.props.onChange}
+          onChange={this._onChange.bind(this)}
           options={[
             'None',
             'Vegetarian',
@@ -71,13 +65,13 @@ export class VolunteerForm extends Component {
           ]}/>
 
         <TextInputBlock
-          value={this.props.data.shirt_size}
-          error={this.props.errors.shirt_size}
+          value={data.shirt_size}
+          error={errors.shirt_size}
           label='Shirt Size'
           name='shirt_size'
           type='options'
           optionsType='small'
-          onChange={this.props.onChange}
+          onChange={this._onChange.bind(this)}
           options={[
             'XS',
             'S',
@@ -86,15 +80,64 @@ export class VolunteerForm extends Component {
             'XL',
             '2XL',
             '3XL',
-            '4XL'
+            '4XL',
+          ]}/>
+
+        <TextInputBlock
+          value={data.friday_availability}
+          error={errors.friday}
+          label='Friday Availability'
+          labelType='large'
+          name='friday_availability'
+          type='options'
+          onChange={this._onChange.bind(this)}
+          optionsType='small'
+          options={[
+            'None',
+            'Morning',
+            'Afternoon',
+            'Evening',
+          ]}/>
+
+        <TextInputBlock
+          value={data.saturday_availability}
+          error={errors.saturday}
+          label='Saturday Availability'
+          labelType='large'
+          name='saturday_availability'
+          type='options'
+          onChange={this._onChange.bind(this)}
+          optionsType='small'
+          options={[
+            'None',
+            'Morning',
+            'Afternoon',
+            'Evening',
           ]}/>
-  
+
+        <TextInputBlock
+          value={data.sunday_availability}
+          error={errors.sunday}
+          label='Sunday Availability'
+          labelType='large'
+          name='sunday_availability'
+          type='options'
+          onChange={this._onChange.bind(this)}
+          optionsType='small'
+          options={[
+            'None',
+            'Morning',
+            'Afternoon',
+            'Evening',
+          ]}
+          helper='In order to be eligible for free HackMerced goodies, you must volunteer for a minimum of 3 hours'/>
+
         <button className='object--center button--gold'>Submit</button>
       </form>
     );
   }
 
-  _onChange(event){
+  _onChange(event) {
     let newState = this._mergeWithCurrentState({
       [event.target.name]: event.target.value
     });
@@ -103,26 +146,30 @@ export class VolunteerForm extends Component {
   }
 
   // Merges the current state with a change
-  _mergeWithCurrentState(change) {
-    return assign(this.props.data, change);
+  _mergeWithCurrentState (change) {
+    const { data } = this.props;
+    return assign(data, change);
   }
 
   // Emits a change of the form state to the application state
-  _emitChange(newState) {
+  _emitChange (newState) {
     this.props.dispatch(updateVolunteerForm(newState));
   }
 
-  _onSubmit(event){
-    event.preventDefault();
-
-    this.props.dispatch(signUpVolunteer({
-      name: this.props.data.name,
-      age: this.props.data.age,
-      availibility: this.props.data.availibility,
-      dietary_restrictions: this.props.data.dietary_restrictions,
-      shirt_size: this.props.data.shirt_size
-    }))
+  _onSubmit (event) {
+    const { dispatch, data } = this.props
 
+    event.preventDefault()
 
+    dispatch(signUpVolunteer({
+      name: data.name,
+      email: data.email,
+      age: data.age,
+      friday_availability: data.friday_availability,
+      saturday_availability: data.saturday_availability,
+      sunday_availability: data.sunday_availability,
+      dietary_restrictions: data.dietary_restrictions,
+      shirt_size: data.shirt_size,
+    }))
   }
 }
diff --git a/HackMerced/2017F/src/app/src/components/volunteer.js b/HackMerced/2017F/src/app/src/components/volunteer.js
index 8883c02..4e40b2b 100644
--- a/HackMerced/2017F/src/app/src/components/volunteer.js
+++ b/HackMerced/2017F/src/app/src/components/volunteer.js
@@ -1,22 +1,22 @@
-
 import React, { Component} from 'react';
 import { connect } from 'react-redux';
 import { browserHistory } from 'react-router'
 import { VolunteerForm } from './forms';
-import { LogoWithCopy } from './partials'
+import { LogoWithCopy } from './partials';
 
+import '../styles/apply.scss';
 
 export class VolunteerComponent extends Component {
 
 
   render() {
     const dispatch = this.props.dispatch;
-    const { volunteerPersonForm, loginErrors } = this.props.data;
+    const { volunteerPersonForm, volunteerErrors } = this.props.data;
 
     return (
-      <div className='authorization-object signup w420 text--center object--center'>
-        <LogoWithCopy/>
-        <VolunteerForm data={volunteerPersonForm} errors={loginErrors} dispatch={dispatch}/>
+      <div className='authorization-form signup w420 text--center object--center'>
+          <LogoWithCopy/>
+          <VolunteerForm data={volunteerPersonForm} errors={volunteerErrors} dispatch={dispatch}/>
       </div>
     )
   }
diff --git a/HackMerced/2017F/src/app/src/constants/constants.js b/HackMerced/2017F/src/app/src/constants/constants.js
index 4bd90c1..fe55e23 100644
--- a/HackMerced/2017F/src/app/src/constants/constants.js
+++ b/HackMerced/2017F/src/app/src/constants/constants.js
@@ -31,3 +31,4 @@ export const UPDATE_MOBILE_MENU_STATUS ='UPDATE_MOBILE_MENU_STATUS';
 export const UPDATE_SUBMITTED_VIEW = 'UPDATE_SUBMITTED_VIEW';
 export const UPDATE_FORGOT_PASSWORD_FORM = 'UPDATE_FORGOT_PASSWORD_FORM';
 export const UPDATE_VOLUNTEER_FORM = 'UPDATE_VOLUNTEER_FORM';
+export const UPDATE_VOLUNTEER_ERRORS = 'UPDATE_VOLUNTEER_ERRORS';
diff --git a/HackMerced/2017F/src/app/src/reducers/index.js b/HackMerced/2017F/src/app/src/reducers/index.js
index 455ce49..3edfeed 100644
--- a/HackMerced/2017F/src/app/src/reducers/index.js
+++ b/HackMerced/2017F/src/app/src/reducers/index.js
@@ -10,7 +10,7 @@
  *   });
  */
 
-import { UPDATE_SIGNUP_FORM, UPDATE_LOGIN_FORM, UPDATE_USER_DATA, UPDATE_SUBMITTED_VIEW, UPDATE_SIGNUP_ERRORS, UPDATE_LOGIN_ERRORS, SET_AUTH, SENDING_REQUEST, SET_ERROR_MESSAGE, SET_AUTH_AS_FALSE, SET_USER_NAME_AS_FALSE, SET_USER_NAME, SET_USER_ID_AS_FALSE, SET_USER_ID, UPDATE_APPLY_STEP_ONE, UPDATE_APPLY_STEP_TWO, UPDATE_APPLY_STEP_THREE, UPDATE_APPLY_STEP_FOUR, SET_CURRENT_APPLY_STEP, UPDATE_USER_UPDATING_STATUS, UPDATE_APPLY_ERRORS, UPDATE_MOBILE_MENU_STATUS,UPDATE_FORGOT_PASSWORD_FORM, UPDATE_VOLUNTEER_FORM} from '../constants';
+import { UPDATE_SIGNUP_FORM, UPDATE_LOGIN_FORM, UPDATE_USER_DATA, UPDATE_SUBMITTED_VIEW, UPDATE_SIGNUP_ERRORS, UPDATE_LOGIN_ERRORS, SET_AUTH, SENDING_REQUEST, SET_ERROR_MESSAGE, SET_AUTH_AS_FALSE, SET_USER_NAME_AS_FALSE, SET_USER_NAME, SET_USER_ID_AS_FALSE, SET_USER_ID, UPDATE_APPLY_STEP_ONE, UPDATE_APPLY_STEP_TWO, UPDATE_APPLY_STEP_THREE, UPDATE_APPLY_STEP_FOUR, SET_CURRENT_APPLY_STEP, UPDATE_USER_UPDATING_STATUS, UPDATE_APPLY_ERRORS, UPDATE_MOBILE_MENU_STATUS,UPDATE_FORGOT_PASSWORD_FORM, UPDATE_VOLUNTEER_FORM, UPDATE_VOLUNTEER_ERRORS } from '../constants';
 // Object.assign is not yet fully supported in all browsers, so we fallback to
 // a polyfill
 const assign = Object.assign || require('object.assign');
@@ -27,25 +27,22 @@ const initialState = {
   forgotPasswordForm: {
     email: ''
   },
-
-
-
-
-volunteerPersonForm: {
-  name: '',
-  age: '',
-  availibility: '', 
-  dietary_restrictions: '',
-  shirt_size: '',
+  volunteerPersonForm: {
+    name: '',
+    age: '',
+    email: '',
+    friday_availability: '',
+    saturday_availability: '',
+    sunday_availability: '',
+    dietary_restrictions: '',
+    shirt_size: '',
   },
-
-
-
   signupErrors:{},
   loginForm: {
     email: '',
     password: '',
   },
+  volunteerErrors: {},
   loginErrors:{},
   user:{},
   currentlySending: false,
@@ -141,9 +138,14 @@ export function homeReducer(state = initialState, action) {
         signupErrors: action.newState
       });
       break;
+    case UPDATE_VOLUNTEER_ERRORS:
+      return assign({}, state, {
+        volunteerErrors: action.newState
+      });
+      break;
     case UPDATE_LOGIN_FORM:
       return assign({}, state, {
-        loginFom: action.newState
+        loginForm: action.newState
       });
       break;
     case UPDATE_LOGIN_ERRORS:
@@ -156,18 +158,11 @@ export function homeReducer(state = initialState, action) {
         forgotPasswordForm: action.newState
       });
       break;
-
-
-
-
-
-      case UPDATE_VOLUNTEER_FORM:
+    case UPDATE_VOLUNTEER_FORM:
       return assign({}, state, {
         volunteerPersonForm: action.newState
       });
       break;
-
-
     case SET_AUTH_AS_FALSE:
       return assign({}, state, {
         loggedIn: false
@@ -186,8 +181,6 @@ export function homeReducer(state = initialState, action) {
       return assign({}, state, {
         applyErrors: action.newState
       });
-
-
     case SET_AUTH:
       return assign({}, state, {
         loggedIn: action.newState
diff --git a/HackMerced/2017F/src/app/src/styles/home.scss b/HackMerced/2017F/src/app/src/styles/home.scss
index 92c4ecf..23cd579 100644
--- a/HackMerced/2017F/src/app/src/styles/home.scss
+++ b/HackMerced/2017F/src/app/src/styles/home.scss
@@ -82,7 +82,7 @@
   width: 100%;
   height: 100%;
   top: 40px;
- opacity: 0;
+  opacity: 0;
 
   @include animation('fadein 1500ms forwards 4.5s');
 }
diff --git a/HackMerced/2017F/src/app/src/styles/main.scss b/HackMerced/2017F/src/app/src/styles/main.scss
index fd496f0..5a805da 100644
--- a/HackMerced/2017F/src/app/src/styles/main.scss
+++ b/HackMerced/2017F/src/app/src/styles/main.scss
@@ -28,4 +28,4 @@ body {
 
 @import 'authorization-form';
 @import 'home';
-@import 'logo';
+@import 'logo';
\ No newline at end of file
diff --git a/HackMerced/2017F/src/app/src/util/auth.js b/HackMerced/2017F/src/app/src/util/auth.js
index 674f31a..7626751 100644
--- a/HackMerced/2017F/src/app/src/util/auth.js
+++ b/HackMerced/2017F/src/app/src/util/auth.js
@@ -1,11 +1,10 @@
 import axios from 'axios';
 
-const BASE_URI = (process.env.NODE_ENV === 'development') ? 'http://localhost:1954' : '';
+const BASE_URI = (process.env.NODE_ENV === 'development') ? 'http://localhost:' + (process.env.PORT || 1954) : '';
 
 export const auth = {
   saveUser(response, resolve) {
     const user = response.data.results;
-
     localStorage.token = response.data.meta.token;
     localStorage.userName = user.name;
     localStorage.userId = user.id;
@@ -75,6 +74,25 @@ export const auth = {
       });
     })
   },
+  submitVolunteerApplication(details) {
+    return new Promise((resolve, reject) => {
+      axios({
+        method: 'post',
+        url: BASE_URI + '/volunteer',
+        headers: {
+          'Authorization': 'Bearer ' + localStorage.token
+        },
+        data: details,
+      })
+      .then(response => {
+        const user = response.data.results;
+        resolve(user);
+      })
+      .catch(error => {
+        reject(error.response.data);
+      });
+    })
+  },
   submitApplication(details) {
     return new Promise((resolve, reject) => {
       axios({
@@ -94,6 +112,27 @@ export const auth = {
       });
     })
   },
+  submitVolunteerApplication(details) {
+    return new Promise((resolve, reject) => {
+      console.log(BASE_URI + '/volunteer')
+      axios({
+        method: 'post',
+        url: BASE_URI + '/volunteer',
+        headers: {
+          'Authorization': 'Bearer ' + localStorage.token
+        },
+        data: details
+      })
+      .then((response) => {
+        const user = response.data.results;
+        resolve(user);
+      })
+      .catch((error) => {
+        console.log(error)
+        reject(error.response.data);
+      })
+    })
+  },
   logout(callback) {
     return new Promise((resolve, reject) => {
 
@@ -125,7 +164,6 @@ export const auth = {
       let headers = new Headers();
           headers.append('Content-Type', 'application/json');
           headers.append('Accept', 'application/json');
-
       axios.post(BASE_URI + '/signup', user)
       .then((response) => {
         auth.saveUser(response, resolve);
diff --git a/HackMerced/2017F/src/server/src/handlers/volunteer.js b/HackMerced/2017F/src/server/src/handlers/volunteer.js
index d617b78..4b7f6ba 100644
--- a/HackMerced/2017F/src/server/src/handlers/volunteer.js
+++ b/HackMerced/2017F/src/server/src/handlers/volunteer.js
@@ -1,41 +1,21 @@
-import Boom from 'boom';
 import axios from 'axios';
-import jwt from 'jsonwebtoken';
-import parseError from '../handlers'
+import { parseError } from '../handlers'
 const TOMOE_URI = process.env.TOMOE_URI;
 
 export const volunteerHandlers = {
   postVolunteer: (req, reply) => {
-    axios
-      .post(TOMOE_URI + '/volunteers/', req.payload)
-      .then((response) => {
-        reply(user);
-      }).catch((err) => {
-         reply(parseError(err.response.data));
-      });
-  },
-
-  getMe: (req, reply) => {
-    axios
-      .get(TOMOE_URI + '/volunteers/' + req.auth.credentials.id)
-      .then((response) => {
-        const user = response.data;
-        reply(user);
-      }).catch((err) => {
-        reply(err);
-      });
-  },
-
-  postSubmit: (req, reply) => {
-      axios
-        .post(TOMOE_URI + '/volunteers/' + req.auth.credentials.id, {
-          status: 'submitted',
-          details: req.payload
-        })
-        .then((response) => {
-          reply(user);
-        }).catch((err) => {
-           reply(parseError(err.response.data));
-        });
+      const email = req.payload.email ? req.payload.email.toLowerCase() : 'bad';
+      const name = req.payload.name ? req.payload.name : '';
+      axios.post(TOMOE_URI + '/volunteers', {
+              name,
+              email,
+              status: 'applied',
+              details: req.payload
+          })
+          .then(({ data }) => {
+            reply(data);
+          }).catch((err) => {
+            reply(parseError(err.response.data));
+          });
   }
 }
diff --git a/HackMerced/2017F/src/server/src/routes/hacker.js b/HackMerced/2017F/src/server/src/routes/hacker.js
index 7d1bfc4..edef1ba 100644
--- a/HackMerced/2017F/src/server/src/routes/hacker.js
+++ b/HackMerced/2017F/src/server/src/routes/hacker.js
@@ -1,10 +1,6 @@
 /*
 
 */
-
-
-import Joi from 'joi';
-import Boom from 'boom';
 import { hackerHandlers } from '../handlers'
 import { hackerValidators } from '../validators'
 
diff --git a/HackMerced/2017F/src/server/src/routes/volunteer.js b/HackMerced/2017F/src/server/src/routes/volunteer.js
index a657af3..de0ebbd 100644
--- a/HackMerced/2017F/src/server/src/routes/volunteer.js
+++ b/HackMerced/2017F/src/server/src/routes/volunteer.js
@@ -1,47 +1,17 @@
-import Joi from 'joi';
-import Boom from 'boom';
 import { volunteerHandlers } from '../handlers'
 import { volunteerValidators } from '../validators'
 
-// [POST] /login
 export const postVolunteer = {
-	path: '/volunteer/signup',
+	path: '/volunteer',
 	method: 'POST',
 	config: {
 		handler: volunteerHandlers.postVolunteer,
+		validate: volunteerValidators.postVolunteer,
 	}
 };
 
-// [GET] /me
-export const getMe = {
-    path: '/volunteer/me',
-    method: 'GET',
-    config: {
-      handler: volunteerHandlers.getMe,
-      auth: {
-          strategy: 'token',
-      }
-    }
-};
-
-// [POST] /submit
-export const postSubmit = {
-    path: '/volunteer/submit',
-    method: 'POST',
-    config: {
-      handler: volunteerHandlers.postSubmit,
-      validate: volunteerValidators.postSubmit,
-      auth: {
-          strategy: 'token',
-      }
-    }
-};
-
 const volunteerRoutes = [
 	postVolunteer,
-	getMe,
-	postSubmit
 ]
 
 export default volunteerRoutes;
-
diff --git a/HackMerced/2017F/src/server/src/validators/volunteer.js b/HackMerced/2017F/src/server/src/validators/volunteer.js
index 588fc49..5d63b69 100644
--- a/HackMerced/2017F/src/server/src/validators/volunteer.js
+++ b/HackMerced/2017F/src/server/src/validators/volunteer.js
@@ -1,31 +1,16 @@
 import Joi from 'joi';
-import fs from 'fs';
-import path from 'path';
-
-import { notMercedOptions } from '../../../app/src/constants'
 
 export const volunteerValidators = {
 	postVolunteer:{
-		//tomoe
-	},
-	
-	getMe:{
-		payload:{
-	    	id: Joi.string().required()
-	    }
-    },
-
-    postSubmit:{
 		payload:{
 			name: Joi.string().required(),
-			age: Joi.number().integer().min(14).max(121).required().options({ language: { any: { allowOnly: 'Sorry we only allow people older than age 14 and younger than 121!' } } }),
-			email: Joi.string().required(),
-			availability: Joi.string().required(),
+			age: Joi.number().integer().min(18).max(121).required().options({ language: { any: { allowOnly: 'Sorry we only allow people older than age 18 and younger than 121!' } } }),
+			email: Joi.string().required().email(),
+			friday_availability: Joi.string().required(),
+			saturday_availability: Joi.string().required(),
+			sunday_availability: Joi.string().required(),
 			dietary_restrictions: Joi.string().required(),
 			shirt_size: Joi.string().required()
 		}
 	}
 }
-
-
-	
\ No newline at end of file