diff --git a/doc/index.md b/doc/index.md
index dc269337..1d884b83 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -187,7 +187,7 @@ Error thrown when an application makes too many requests and is throttled.
 <a name="module_errors.MonthlyLimitExceeded"></a>
 
 ### errors.MonthlyLimitExceeded(message) ⇐ <code>SmartcarError</code>
-Error thrown when an application requests more resources than it's allowed
+Error thrown when an application requests more resources than its allowed
 limit, e.g., gone over their allotted monthly request limit.
 
 **Kind**: static method of [<code>errors</code>](#module_errors)
@@ -224,6 +224,8 @@ Error thrown when vehicle is not capable of performing the method.
 <a name="module_errors.GatewayTimeoutError"></a>
 
 ### errors.GatewayTimeoutError(message)
+Error thrown when gateway to Smartcar times out
+
 **Kind**: static method of [<code>errors</code>](#module_errors)
 
 | Param | Description |
@@ -313,99 +315,11 @@ Exchange a refresh token for a new access object.
     * [.disconnect()](#Vehicle+disconnect) ⇒ [<code>Promise</code>](#Promise)
     * [.permissions()](#Vehicle+permissions) ⇒ [<code>Promise</code>](#Promise)
     * [.info()](#Vehicle+info) ⇒ [<code>Promise</code>](#Promise)
-    * [.accelerometer()](#Vehicle+accelerometer) ⇒ [<code>Promise</code>](#Promise)
-    * [.airbags()](#Vehicle+airbags) ⇒ [<code>Promise</code>](#Promise)
-    * [.barometer()](#Vehicle+barometer) ⇒ [<code>Promise</code>](#Promise)
-    * [.battery()](#Vehicle+battery) ⇒ [<code>Promise</code>](#Promise)
-    * [.charge()](#Vehicle+charge) ⇒ [<code>Promise</code>](#Promise)
-    * [.chargeAmmeter()](#Vehicle+chargeAmmeter) ⇒ [<code>Promise</code>](#Promise)
-    * [.chargeLimit()](#Vehicle+chargeLimit) ⇒ [<code>Promise</code>](#Promise)
-    * [.chargeSchedule()](#Vehicle+chargeSchedule) ⇒ [<code>Promise</code>](#Promise)
-    * [.chargeVoltmeter()](#Vehicle+chargeVoltmeter) ⇒ [<code>Promise</code>](#Promise)
-    * [.climate()](#Vehicle+climate) ⇒ [<code>Promise</code>](#Promise)
-    * [.collisionSensor()](#Vehicle+collisionSensor) ⇒ [<code>Promise</code>](#Promise)
-    * [.compass()](#Vehicle+compass) ⇒ [<code>Promise</code>](#Promise)
-    * [.cruiseControl()](#Vehicle+cruiseControl) ⇒ [<code>Promise</code>](#Promise)
-    * [.dimensions()](#Vehicle+dimensions) ⇒ [<code>Promise</code>](#Promise)
-    * [.doors()](#Vehicle+doors) ⇒ [<code>Promise</code>](#Promise)
-    * [.childSafetyLocks()](#Vehicle+childSafetyLocks) ⇒ [<code>Promise</code>](#Promise)
-    * [.driveMode()](#Vehicle+driveMode) ⇒ [<code>Promise</code>](#Promise)
-    * [.engine()](#Vehicle+engine) ⇒ [<code>Promise</code>](#Promise)
-    * [.engineCoolant()](#Vehicle+engineCoolant) ⇒ [<code>Promise</code>](#Promise)
-    * [.engineHood()](#Vehicle+engineHood) ⇒ [<code>Promise</code>](#Promise)
-    * [.engineOil()](#Vehicle+engineOil) ⇒ [<code>Promise</code>](#Promise)
-    * [.engineThrottle()](#Vehicle+engineThrottle) ⇒ [<code>Promise</code>](#Promise)
-    * [.fuel()](#Vehicle+fuel) ⇒ [<code>Promise</code>](#Promise)
-    * [.gyroscope()](#Vehicle+gyroscope) ⇒ [<code>Promise</code>](#Promise)
-    * [.ignition()](#Vehicle+ignition) ⇒ [<code>Promise</code>](#Promise)
-    * [.hazardLight()](#Vehicle+hazardLight) ⇒ [<code>Promise</code>](#Promise)
-    * [.headlights()](#Vehicle+headlights) ⇒ [<code>Promise</code>](#Promise)
-    * [.interiorLights()](#Vehicle+interiorLights) ⇒ [<code>Promise</code>](#Promise)
-    * [.turnIndicator()](#Vehicle+turnIndicator) ⇒ [<code>Promise</code>](#Promise)
     * [.location()](#Vehicle+location) ⇒ [<code>Promise</code>](#Promise)
-    * [.sideviewMirrors()](#Vehicle+sideviewMirrors) ⇒ [<code>Promise</code>](#Promise)
     * [.odometer()](#Vehicle+odometer) ⇒ [<code>Promise</code>](#Promise)
-    * [.tripOdometers()](#Vehicle+tripOdometers) ⇒ [<code>Promise</code>](#Promise)
-    * [.acceleratorPedal()](#Vehicle+acceleratorPedal) ⇒ [<code>Promise</code>](#Promise)
-    * [.brakePedal()](#Vehicle+brakePedal) ⇒ [<code>Promise</code>](#Promise)
-    * [.rainSensor()](#Vehicle+rainSensor) ⇒ [<code>Promise</code>](#Promise)
-    * [.seats()](#Vehicle+seats) ⇒ [<code>Promise</code>](#Promise)
-    * [.security()](#Vehicle+security) ⇒ [<code>Promise</code>](#Promise)
-    * [.sliBattery()](#Vehicle+sliBattery) ⇒ [<code>Promise</code>](#Promise)
-    * [.speedometer()](#Vehicle+speedometer) ⇒ [<code>Promise</code>](#Promise)
-    * [.steeringWheel()](#Vehicle+steeringWheel) ⇒ [<code>Promise</code>](#Promise)
-    * [.sunroof()](#Vehicle+sunroof) ⇒ [<code>Promise</code>](#Promise)
-    * [.tachometer()](#Vehicle+tachometer) ⇒ [<code>Promise</code>](#Promise)
-    * [.interiorThermistor()](#Vehicle+interiorThermistor) ⇒ [<code>Promise</code>](#Promise)
-    * [.exteriorThermistor()](#Vehicle+exteriorThermistor) ⇒ [<code>Promise</code>](#Promise)
-    * [.tires()](#Vehicle+tires) ⇒ [<code>Promise</code>](#Promise)
-    * [.transmission()](#Vehicle+transmission) ⇒ [<code>Promise</code>](#Promise)
-    * [.transmissionFluid()](#Vehicle+transmissionFluid) ⇒ [<code>Promise</code>](#Promise)
-    * [.frontTrunk()](#Vehicle+frontTrunk) ⇒ [<code>Promise</code>](#Promise)
-    * [.rearTrunk()](#Vehicle+rearTrunk) ⇒ [<code>Promise</code>](#Promise)
     * [.vin()](#Vehicle+vin) ⇒ [<code>Promise</code>](#Promise)
-    * [.washerFluid()](#Vehicle+washerFluid) ⇒ [<code>Promise</code>](#Promise)
-    * [.wheels()](#Vehicle+wheels) ⇒ [<code>Promise</code>](#Promise)
-    * [.wheelSpeeds()](#Vehicle+wheelSpeeds) ⇒ [<code>Promise</code>](#Promise)
-    * [.windows()](#Vehicle+windows) ⇒ [<code>Promise</code>](#Promise)
-    * [.startCharging()](#Vehicle+startCharging) ⇒ [<code>Promise</code>](#Promise)
-    * [.stopCharging()](#Vehicle+stopCharging) ⇒ [<code>Promise</code>](#Promise)
-    * [.enableChargeLimit([limit])](#Vehicle+enableChargeLimit) ⇒ [<code>Promise</code>](#Promise)
-    * [.disableChargeLimit()](#Vehicle+disableChargeLimit) ⇒ [<code>Promise</code>](#Promise)
-    * [.enableChargeSchedule(startTime)](#Vehicle+enableChargeSchedule) ⇒ [<code>Promise</code>](#Promise)
-    * [.disableChargeSchedule()](#Vehicle+disableChargeSchedule) ⇒ [<code>Promise</code>](#Promise)
-    * [.activateChildSafetyLocks(childSafetyLocksArr)](#Vehicle+activateChildSafetyLocks) ⇒ [<code>Promise</code>](#Promise)
-    * [.disableChildSafetyLocks(childSafetyLocksArr)](#Vehicle+disableChildSafetyLocks) ⇒ [<code>Promise</code>](#Promise)
-    * [.startClimate(temperature)](#Vehicle+startClimate) ⇒ [<code>Promise</code>](#Promise)
-    * [.stopClimate()](#Vehicle+stopClimate) ⇒ [<code>Promise</code>](#Promise)
-    * [.openEngineHood()](#Vehicle+openEngineHood) ⇒ [<code>Promise</code>](#Promise)
-    * [.closeEngineHood()](#Vehicle+closeEngineHood) ⇒ [<code>Promise</code>](#Promise)
-    * [.honkHorn()](#Vehicle+honkHorn) ⇒ [<code>Promise</code>](#Promise)
-    * [.startIgnition()](#Vehicle+startIgnition) ⇒ [<code>Promise</code>](#Promise)
-    * [.setIgnitionOn()](#Vehicle+setIgnitionOn) ⇒ [<code>Promise</code>](#Promise)
-    * [.setIgnitionAccessory()](#Vehicle+setIgnitionAccessory) ⇒ [<code>Promise</code>](#Promise)
-    * [.setIgnitionOff()](#Vehicle+setIgnitionOff) ⇒ [<code>Promise</code>](#Promise)
-    * [.flashHeadlights(type)](#Vehicle+flashHeadlights) ⇒ [<code>Promise</code>](#Promise)
-    * [.tiltSideviewMirrors(mirrorsArr)](#Vehicle+tiltSideviewMirrors) ⇒ [<code>Promise</code>](#Promise)
-    * [.startPanic()](#Vehicle+startPanic) ⇒ [<code>Promise</code>](#Promise)
-    * [.stopPanic()](#Vehicle+stopPanic) ⇒ [<code>Promise</code>](#Promise)
-    * [.openChargePort()](#Vehicle+openChargePort) ⇒ [<code>Promise</code>](#Promise)
-    * [.closeChargePort()](#Vehicle+closeChargePort) ⇒ [<code>Promise</code>](#Promise)
-    * [.openFuelPort()](#Vehicle+openFuelPort) ⇒ [<code>Promise</code>](#Promise)
-    * [.closeFuelPort()](#Vehicle+closeFuelPort) ⇒ [<code>Promise</code>](#Promise)
     * [.lock()](#Vehicle+lock) ⇒ [<code>Promise</code>](#Promise)
     * [.unlock()](#Vehicle+unlock) ⇒ [<code>Promise</code>](#Promise)
-    * [.openSunroof(percentOpen)](#Vehicle+openSunroof) ⇒ [<code>Promise</code>](#Promise)
-    * [.ventSunroof()](#Vehicle+ventSunroof) ⇒ [<code>Promise</code>](#Promise)
-    * [.closeSunroof()](#Vehicle+closeSunroof) ⇒ [<code>Promise</code>](#Promise)
-    * [.openFrontTrunk()](#Vehicle+openFrontTrunk) ⇒ [<code>Promise</code>](#Promise)
-    * [.closeFrontTrunk()](#Vehicle+closeFrontTrunk) ⇒ [<code>Promise</code>](#Promise)
-    * [.openRearTrunk()](#Vehicle+openRearTrunk) ⇒ [<code>Promise</code>](#Promise)
-    * [.closeRearTrunk()](#Vehicle+closeRearTrunk) ⇒ [<code>Promise</code>](#Promise)
-    * [.openWindows(windowsArr)](#Vehicle+openWindows) ⇒ [<code>Promise</code>](#Promise)
-    * [.closeWindows(windowsArr)](#Vehicle+closeWindows) ⇒ [<code>Promise</code>](#Promise)
-    * [.lockWindows(windowsArr)](#Vehicle+lockWindows) ⇒ [<code>Promise</code>](#Promise)
-    * [.unlockWindows(windowsArr)](#Vehicle+unlockWindows) ⇒ [<code>Promise</code>](#Promise)
 
 <a name="new_Vehicle_new"></a>
 
@@ -456,209 +370,6 @@ GET Vehicle.info
 
 **Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
 **Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's info
-<a name="Vehicle+accelerometer"></a>
-
-### vehicle.accelerometer() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.accelerometer
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's accelerometer
-<a name="Vehicle+airbags"></a>
-
-### vehicle.airbags() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.airbags
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's airbags
-<a name="Vehicle+barometer"></a>
-
-### vehicle.barometer() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.barometer
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's barometer
-<a name="Vehicle+battery"></a>
-
-### vehicle.battery() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.battery
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's battery
-<a name="Vehicle+charge"></a>
-
-### vehicle.charge() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.charge
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's charge
-<a name="Vehicle+chargeAmmeter"></a>
-
-### vehicle.chargeAmmeter() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.chargeAmmeter
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's charge ammeter
-<a name="Vehicle+chargeLimit"></a>
-
-### vehicle.chargeLimit() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.chargeLimit
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's chargeLimit
-<a name="Vehicle+chargeSchedule"></a>
-
-### vehicle.chargeSchedule() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.chargeSchedule
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's chargeSchedule
-<a name="Vehicle+chargeVoltmeter"></a>
-
-### vehicle.chargeVoltmeter() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.chargeVoltmeter
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's charge voltmeter
-<a name="Vehicle+climate"></a>
-
-### vehicle.climate() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.climate
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's climate
-<a name="Vehicle+collisionSensor"></a>
-
-### vehicle.collisionSensor() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.collisionSensor
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's collisionSensor
-<a name="Vehicle+compass"></a>
-
-### vehicle.compass() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.compass
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's compass
-<a name="Vehicle+cruiseControl"></a>
-
-### vehicle.cruiseControl() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.cruiseControl
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's cruiseControl
-<a name="Vehicle+dimensions"></a>
-
-### vehicle.dimensions() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.dimensions
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's dimensions
-<a name="Vehicle+doors"></a>
-
-### vehicle.doors() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.doors
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's doors
-<a name="Vehicle+childSafetyLocks"></a>
-
-### vehicle.childSafetyLocks() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.childSafetyLocks
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's childSafetyLocks
-<a name="Vehicle+driveMode"></a>
-
-### vehicle.driveMode() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.driveMode
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's driveMode
-<a name="Vehicle+engine"></a>
-
-### vehicle.engine() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.engine
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's engine
-<a name="Vehicle+engineCoolant"></a>
-
-### vehicle.engineCoolant() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.engineCoolant
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's engineCoolant
-<a name="Vehicle+engineHood"></a>
-
-### vehicle.engineHood() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.engineHood
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's engineHood
-<a name="Vehicle+engineOil"></a>
-
-### vehicle.engineOil() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.engineOil
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's engineOil
-<a name="Vehicle+engineThrottle"></a>
-
-### vehicle.engineThrottle() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.engineThrottle
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's engineThrottle
-<a name="Vehicle+fuel"></a>
-
-### vehicle.fuel() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.fuel
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's fuel
-<a name="Vehicle+gyroscope"></a>
-
-### vehicle.gyroscope() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.gyroscope
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's gyroscope
-<a name="Vehicle+ignition"></a>
-
-### vehicle.ignition() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.ignition
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's ignition
-<a name="Vehicle+hazardLight"></a>
-
-### vehicle.hazardLight() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.hazardLight
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's hazardLight
-<a name="Vehicle+headlights"></a>
-
-### vehicle.headlights() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.headlights
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's headlights
-<a name="Vehicle+interiorLights"></a>
-
-### vehicle.interiorLights() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.interiorLights
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's interiorLights
-<a name="Vehicle+turnIndicator"></a>
-
-### vehicle.turnIndicator() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.turnIndicator
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's turnIndicator
 <a name="Vehicle+location"></a>
 
 ### vehicle.location() ⇒ [<code>Promise</code>](#Promise)
@@ -666,13 +377,6 @@ GET Vehicle.location
 
 **Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
 **Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's location
-<a name="Vehicle+sideviewMirrors"></a>
-
-### vehicle.sideviewMirrors() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.sideviewMirrors
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's sideviewMirrors
 <a name="Vehicle+odometer"></a>
 
 ### vehicle.odometer() ⇒ [<code>Promise</code>](#Promise)
@@ -680,132 +384,6 @@ GET Vehicle.odometer
 
 **Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
 **Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's odometer
-<a name="Vehicle+tripOdometers"></a>
-
-### vehicle.tripOdometers() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.tripOdometers
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's tripOdometers
-<a name="Vehicle+acceleratorPedal"></a>
-
-### vehicle.acceleratorPedal() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.acceleratorPedal
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's acceleratorPedal
-<a name="Vehicle+brakePedal"></a>
-
-### vehicle.brakePedal() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.brakePedal
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's brakePedal
-<a name="Vehicle+rainSensor"></a>
-
-### vehicle.rainSensor() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.rainSensor
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's rainSensor
-<a name="Vehicle+seats"></a>
-
-### vehicle.seats() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.seats
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's seats
-<a name="Vehicle+security"></a>
-
-### vehicle.security() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.security
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's security
-<a name="Vehicle+sliBattery"></a>
-
-### vehicle.sliBattery() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.sliBattery
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's sliBattery
-<a name="Vehicle+speedometer"></a>
-
-### vehicle.speedometer() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.speedometer
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's speedometer
-<a name="Vehicle+steeringWheel"></a>
-
-### vehicle.steeringWheel() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.steeringWheel
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's steeringWheel
-<a name="Vehicle+sunroof"></a>
-
-### vehicle.sunroof() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.sunroof
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's sunroof
-<a name="Vehicle+tachometer"></a>
-
-### vehicle.tachometer() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.tachometer
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's tachometer
-<a name="Vehicle+interiorThermistor"></a>
-
-### vehicle.interiorThermistor() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.interiorThermistor
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's interiorThermistor
-<a name="Vehicle+exteriorThermistor"></a>
-
-### vehicle.exteriorThermistor() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.exteriorThermistor
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's exteriorThermistor
-<a name="Vehicle+tires"></a>
-
-### vehicle.tires() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.tires
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's tires
-<a name="Vehicle+transmission"></a>
-
-### vehicle.transmission() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.transmission
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's transmission
-<a name="Vehicle+transmissionFluid"></a>
-
-### vehicle.transmissionFluid() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.transmissionFluid
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's transmissionFluid
-<a name="Vehicle+frontTrunk"></a>
-
-### vehicle.frontTrunk() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.frontTrunk
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's frontTrunk
-<a name="Vehicle+rearTrunk"></a>
-
-### vehicle.rearTrunk() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.rearTrunk
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's rearTrunk
 <a name="Vehicle+vin"></a>
 
 ### vehicle.vin() ⇒ [<code>Promise</code>](#Promise)
@@ -813,244 +391,6 @@ GET Vehicle.vin
 
 **Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
 **Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's vin
-<a name="Vehicle+washerFluid"></a>
-
-### vehicle.washerFluid() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.washerFluid
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's washerFluid
-<a name="Vehicle+wheels"></a>
-
-### vehicle.wheels() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.wheels
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's wheels
-<a name="Vehicle+wheelSpeeds"></a>
-
-### vehicle.wheelSpeeds() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.wheelSpeeds
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's wheelSpeeds
-<a name="Vehicle+windows"></a>
-
-### vehicle.windows() ⇒ [<code>Promise</code>](#Promise)
-GET Vehicle.windows
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A promise for info on the vehicle's windows
-<a name="Vehicle+startCharging"></a>
-
-### vehicle.startCharging() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.startCharging
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+stopCharging"></a>
-
-### vehicle.stopCharging() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.stopCharging
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+enableChargeLimit"></a>
-
-### vehicle.enableChargeLimit([limit]) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.enableChargeLimit
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| [limit] | <code>Float</code> | override the previously set limit,                          must be between 0 - 1 |
-
-<a name="Vehicle+disableChargeLimit"></a>
-
-### vehicle.disableChargeLimit() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.disableChargeLimit
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+enableChargeSchedule"></a>
-
-### vehicle.enableChargeSchedule(startTime) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.enableChargeSchedule
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| startTime | <code>String</code> | the datetime string representing when to start charging, i.e, '11:11' |
-
-<a name="Vehicle+disableChargeSchedule"></a>
-
-### vehicle.disableChargeSchedule() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.disableChargeSchedule
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+activateChildSafetyLocks"></a>
-
-### vehicle.activateChildSafetyLocks(childSafetyLocksArr) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.activateChildSafetyLocks
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| childSafetyLocksArr | <code>Array</code> | array of child safety lock objects, i.e, [{location: 'BACK_LEFT'}] |
-
-<a name="Vehicle+disableChildSafetyLocks"></a>
-
-### vehicle.disableChildSafetyLocks(childSafetyLocksArr) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.disableChildSafetyLocks
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| childSafetyLocksArr | <code>Array</code> | array of child safety lock objects, i.e, [{location: 'BACK_LEFT'}] |
-
-<a name="Vehicle+startClimate"></a>
-
-### vehicle.startClimate(temperature) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.startClimate
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| temperature | <code>Number</code> | the temperature to set the car to |
-
-<a name="Vehicle+stopClimate"></a>
-
-### vehicle.stopClimate() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.stopClimate
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+openEngineHood"></a>
-
-### vehicle.openEngineHood() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.openEngineHood
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+closeEngineHood"></a>
-
-### vehicle.closeEngineHood() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.closeEngineHood
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+honkHorn"></a>
-
-### vehicle.honkHorn() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.honkHorn
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+startIgnition"></a>
-
-### vehicle.startIgnition() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.startIgnition
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+setIgnitionOn"></a>
-
-### vehicle.setIgnitionOn() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.setIgnitionOn
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+setIgnitionAccessory"></a>
-
-### vehicle.setIgnitionAccessory() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.setIgnitionAccessory
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+setIgnitionOff"></a>
-
-### vehicle.setIgnitionOff() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.setIgnitionOff
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+flashHeadlights"></a>
-
-### vehicle.flashHeadlights(type) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.flashHeadlights
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| type | <code>String</code> | the type of headlight to perform the action on, i.e 'HIGH_BEAM' |
-
-<a name="Vehicle+tiltSideviewMirrors"></a>
-
-### vehicle.tiltSideviewMirrors(mirrorsArr) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.tiltSideviewMirrors
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| mirrorsArr | <code>Array</code> | array of mirror objects to perform action on, i.e [{location: 'LEFT'}] |
-
-<a name="Vehicle+startPanic"></a>
-
-### vehicle.startPanic() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.startPanic
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+stopPanic"></a>
-
-### vehicle.stopPanic() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.stopPanic
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+openChargePort"></a>
-
-### vehicle.openChargePort() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.openChargePort
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+closeChargePort"></a>
-
-### vehicle.closeChargePort() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.closeChargePort
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+openFuelPort"></a>
-
-### vehicle.openFuelPort() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.openFuelPort
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+closeFuelPort"></a>
-
-### vehicle.closeFuelPort() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.closeFuelPort
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
 <a name="Vehicle+lock"></a>
 
 ### vehicle.lock() ⇒ [<code>Promise</code>](#Promise)
@@ -1065,108 +405,6 @@ POST Vehicle.unlock
 
 **Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
 **Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+openSunroof"></a>
-
-### vehicle.openSunroof(percentOpen) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.openSunroof
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| percentOpen | <code>Number</code> | max: 1, min: 0 |
-
-<a name="Vehicle+ventSunroof"></a>
-
-### vehicle.ventSunroof() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.ventSunroof
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+closeSunroof"></a>
-
-### vehicle.closeSunroof() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.closeSunroof
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+openFrontTrunk"></a>
-
-### vehicle.openFrontTrunk() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.openFrontTrunk
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+closeFrontTrunk"></a>
-
-### vehicle.closeFrontTrunk() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.closeFrontTrunk
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+openRearTrunk"></a>
-
-### vehicle.openRearTrunk() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.openRearTrunk
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+closeRearTrunk"></a>
-
-### vehicle.closeRearTrunk() ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.closeRearTrunk
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-<a name="Vehicle+openWindows"></a>
-
-### vehicle.openWindows(windowsArr) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.openWindows
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| windowsArr | <code>Array</code> | array of window objects to perform action upon, i.e [{location: 'BACK_LEFT'}, {location: 'FRONT_RIGHT'}] |
-
-<a name="Vehicle+closeWindows"></a>
-
-### vehicle.closeWindows(windowsArr) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.closeWindows
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| windowsArr | <code>Array</code> | array of window objects to perform action upon, i.e [{location: 'BACK_LEFT'}, {location: 'FRONT_RIGHT'}] |
-
-<a name="Vehicle+lockWindows"></a>
-
-### vehicle.lockWindows(windowsArr) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.lockWindows
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| windowsArr | <code>Array</code> | array of window objects to perform action upon, i.e [{location: 'BACK_LEFT'}, {location: 'FRONT_RIGHT'}] |
-
-<a name="Vehicle+unlockWindows"></a>
-
-### vehicle.unlockWindows(windowsArr) ⇒ [<code>Promise</code>](#Promise)
-POST Vehicle.unlockWindows
-
-**Kind**: instance method of [<code>Vehicle</code>](#Vehicle)
-**Returns**: [<code>Promise</code>](#Promise) - A success or failure response
-
-| Param | Type | Description |
-| --- | --- | --- |
-| windowsArr | <code>Array</code> | array of window objects to perform action upon, i.e [{location: 'BACK_LEFT'}, {location: 'FRONT_RIGHT'}] |
-
 <a name="Access"></a>
 
 ## Access : <code>Object</code>
diff --git a/lib/vehicle.js b/lib/vehicle.js
index 24fe68a7..ae0b8f15 100644
--- a/lib/vehicle.js
+++ b/lib/vehicle.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const _ = require('lodash');
-
 const util = require('./util');
 
 /** @exports Vehicle */
@@ -83,7 +81,6 @@ Vehicle.prototype.permissions = function() {
 
 /* VEHICLE API METHODS */
 
-
 /**
  * GET Vehicle.info
  *
@@ -93,267 +90,6 @@ Vehicle.prototype.info = function() {
   return util.wrap(this.request.get('/'));
 };
 
-/**
- * GET Vehicle.accelerometer
- *
- * @return {Promise} A promise for info on the vehicle's accelerometer
- */
-Vehicle.prototype.accelerometer = function() {
-  return util.wrap(this.request.get('accelerometer'));
-};
-
-/**
- * GET Vehicle.airbags
- *
- * @return {Promise} A promise for info on the vehicle's airbags
- */
-Vehicle.prototype.airbags = function() {
-  return util.wrap(this.request.get('airbags'));
-};
-
-/**
- * GET Vehicle.barometer
- *
- * @return {Promise} A promise for info on the vehicle's barometer
- */
-Vehicle.prototype.barometer = function() {
-  return util.wrap(this.request.get('barometer'));
-};
-
-/**
- * GET Vehicle.battery
- *
- * @return {Promise} A promise for info on the vehicle's battery
- */
-Vehicle.prototype.battery = function() {
-  return util.wrap(this.request.get('battery'));
-};
-
-/**
- * GET Vehicle.charge
- *
- * @return {Promise} A promise for info on the vehicle's charge
- */
-Vehicle.prototype.charge = function() {
-  return util.wrap(this.request.get('charge'));
-};
-
-/**
- * GET Vehicle.chargeAmmeter
- *
- * @return {Promise} A promise for info on the vehicle's charge ammeter
- */
-Vehicle.prototype.chargeAmmeter = function() {
-  return util.wrap(this.request.get('charge/ammeter'));
-};
-
-/**
- * GET Vehicle.chargeLimit
- *
- * @return {Promise} A promise for info on the vehicle's chargeLimit
- */
-Vehicle.prototype.chargeLimit = function() {
-  return util.wrap(this.request.get('charge/limit'));
-};
-
-/**
- * GET Vehicle.chargeSchedule
- *
- * @return {Promise} A promise for info on the vehicle's chargeSchedule
- */
-Vehicle.prototype.chargeSchedule = function() {
-  return util.wrap(this.request.get('charge/schedule'));
-};
-
-/**
- * GET Vehicle.chargeVoltmeter
- *
- * @return {Promise} A promise for info on the vehicle's charge voltmeter
- */
-Vehicle.prototype.chargeVoltmeter = function() {
-  return util.wrap(this.request.get('charge/voltmeter'));
-};
-
-/**
- * GET Vehicle.climate
- *
- * @return {Promise} A promise for info on the vehicle's climate
- */
-Vehicle.prototype.climate = function() {
-  return util.wrap(this.request.get('climate'));
-};
-
-/**
- * GET Vehicle.collisionSensor
- *
- * @return {Promise} A promise for info on the vehicle's collisionSensor
- */
-Vehicle.prototype.collisionSensor = function() {
-  return util.wrap(this.request.get('collision_sensor'));
-};
-
-/**
- * GET Vehicle.compass
- *
- * @return {Promise} A promise for info on the vehicle's compass
- */
-Vehicle.prototype.compass = function() {
-  return util.wrap(this.request.get('compass'));
-};
-
-/**
- * GET Vehicle.cruiseControl
- *
- * @return {Promise} A promise for info on the vehicle's cruiseControl
- */
-Vehicle.prototype.cruiseControl = function() {
-  return util.wrap(this.request.get('cruise_control'));
-};
-
-/**
- * GET Vehicle.dimensions
- *
- * @return {Promise} A promise for info on the vehicle's dimensions
- */
-Vehicle.prototype.dimensions = function() {
-  return util.wrap(this.request.get('dimensions'));
-};
-
-/**
- * GET Vehicle.doors
- *
- * @return {Promise} A promise for info on the vehicle's doors
- */
-Vehicle.prototype.doors = function() {
-  return util.wrap(this.request.get('doors'));
-};
-
-/**
- * GET Vehicle.childSafetyLocks
- *
- * @return {Promise} A promise for info on the vehicle's childSafetyLocks
- */
-Vehicle.prototype.childSafetyLocks = function() {
-  return util.wrap(this.request.get('doors/child_safety_locks'));
-};
-
-/**
- * GET Vehicle.driveMode
- *
- * @return {Promise} A promise for info on the vehicle's driveMode
- */
-Vehicle.prototype.driveMode = function() {
-  return util.wrap(this.request.get('drive_mode'));
-};
-
-/**
- * GET Vehicle.engine
- *
- * @return {Promise} A promise for info on the vehicle's engine
- */
-Vehicle.prototype.engine = function() {
-  return util.wrap(this.request.get('engine'));
-};
-
-/**
- * GET Vehicle.engineCoolant
- *
- * @return {Promise} A promise for info on the vehicle's engineCoolant
- */
-Vehicle.prototype.engineCoolant = function() {
-  return util.wrap(this.request.get('engine/coolant'));
-};
-
-/**
- * GET Vehicle.engineHood
- *
- * @return {Promise} A promise for info on the vehicle's engineHood
- */
-Vehicle.prototype.engineHood = function() {
-  return util.wrap(this.request.get('engine/hood'));
-};
-
-/**
- * GET Vehicle.engineOil
- *
- * @return {Promise} A promise for info on the vehicle's engineOil
- */
-Vehicle.prototype.engineOil = function() {
-  return util.wrap(this.request.get('engine/oil'));
-};
-
-/**
- * GET Vehicle.engineThrottle
- *
- * @return {Promise} A promise for info on the vehicle's engineThrottle
- */
-Vehicle.prototype.engineThrottle = function() {
-  return util.wrap(this.request.get('engine/throttle'));
-};
-
-/**
- * GET Vehicle.fuel
- *
- * @return {Promise} A promise for info on the vehicle's fuel
- */
-Vehicle.prototype.fuel = function() {
-  return util.wrap(this.request.get('fuel'));
-};
-
-/**
- * GET Vehicle.gyroscope
- *
- * @return {Promise} A promise for info on the vehicle's gyroscope
- */
-Vehicle.prototype.gyroscope = function() {
-  return util.wrap(this.request.get('gyroscope'));
-};
-
-/**
- * GET Vehicle.ignition
- *
- * @return {Promise} A promise for info on the vehicle's ignition
- */
-Vehicle.prototype.ignition = function() {
-  return util.wrap(this.request.get('ignition'));
-};
-
-/**
- * GET Vehicle.hazardLight
- *
- * @return {Promise} A promise for info on the vehicle's hazardLight
- */
-Vehicle.prototype.hazardLight = function() {
-  return util.wrap(this.request.get('lights/hazard'));
-};
-
-/**
- * GET Vehicle.headlights
- *
- * @return {Promise} A promise for info on the vehicle's headlights
- */
-Vehicle.prototype.headlights = function() {
-  return util.wrap(this.request.get('lights/headlights'));
-};
-
-/**
- * GET Vehicle.interiorLights
- *
- * @return {Promise} A promise for info on the vehicle's interiorLights
- */
-Vehicle.prototype.interiorLights = function() {
-  return util.wrap(this.request.get('lights/interior'));
-};
-
-/**
- * GET Vehicle.turnIndicator
- *
- * @return {Promise} A promise for info on the vehicle's turnIndicator
- */
-Vehicle.prototype.turnIndicator = function() {
-  return util.wrap(this.request.get('lights/turn_indicator'));
-};
-
 /**
  * GET Vehicle.location
  *
@@ -363,15 +99,6 @@ Vehicle.prototype.location = function() {
   return util.wrap(this.request.get('location'));
 };
 
-/**
- * GET Vehicle.sideviewMirrors
- *
- * @return {Promise} A promise for info on the vehicle's sideviewMirrors
- */
-Vehicle.prototype.sideviewMirrors = function() {
-  return util.wrap(this.request.get('mirrors/side_view'));
-};
-
 /**
  * GET Vehicle.odometer
  *
@@ -381,168 +108,6 @@ Vehicle.prototype.odometer = function() {
   return util.wrap(this.request.get('odometer'));
 };
 
-/**
- * GET Vehicle.tripOdometers
- *
- * @return {Promise} A promise for info on the vehicle's tripOdometers
- */
-Vehicle.prototype.tripOdometers = function() {
-  return util.wrap(this.request.get('odometer/trips'));
-};
-
-/**
- * GET Vehicle.acceleratorPedal
- *
- * @return {Promise} A promise for info on the vehicle's acceleratorPedal
- */
-Vehicle.prototype.acceleratorPedal = function() {
-  return util.wrap(this.request.get('pedals/accelerator'));
-};
-
-/**
- * GET Vehicle.brakePedal
- *
- * @return {Promise} A promise for info on the vehicle's brakePedal
- */
-Vehicle.prototype.brakePedal = function() {
-  return util.wrap(this.request.get('pedals/brake'));
-};
-
-/**
- * GET Vehicle.rainSensor
- *
- * @return {Promise} A promise for info on the vehicle's rainSensor
- */
-Vehicle.prototype.rainSensor = function() {
-  return util.wrap(this.request.get('rain_sensor'));
-};
-
-/**
- * GET Vehicle.seats
- *
- * @return {Promise} A promise for info on the vehicle's seats
- */
-Vehicle.prototype.seats = function() {
-  return util.wrap(this.request.get('seats'));
-};
-
-/**
- * GET Vehicle.security
- *
- * @return {Promise} A promise for info on the vehicle's security
- */
-Vehicle.prototype.security = function() {
-  return util.wrap(this.request.get('security'));
-};
-
-/**
- * GET Vehicle.sliBattery
- *
- * @return {Promise} A promise for info on the vehicle's sliBattery
- */
-Vehicle.prototype.sliBattery = function() {
-  return util.wrap(this.request.get('sli_battery'));
-};
-
-/**
- * GET Vehicle.speedometer
- *
- * @return {Promise} A promise for info on the vehicle's speedometer
- */
-Vehicle.prototype.speedometer = function() {
-  return util.wrap(this.request.get('speedometer'));
-};
-
-/**
- * GET Vehicle.steeringWheel
- *
- * @return {Promise} A promise for info on the vehicle's steeringWheel
- */
-Vehicle.prototype.steeringWheel = function() {
-  return util.wrap(this.request.get('steering_wheel'));
-};
-
-/**
- * GET Vehicle.sunroof
- *
- * @return {Promise} A promise for info on the vehicle's sunroof
- */
-Vehicle.prototype.sunroof = function() {
-  return util.wrap(this.request.get('sunroof'));
-};
-
-/**
- * GET Vehicle.tachometer
- *
- * @return {Promise} A promise for info on the vehicle's tachometer
- */
-Vehicle.prototype.tachometer = function() {
-  return util.wrap(this.request.get('tachometer'));
-};
-
-/**
- * GET Vehicle.interiorThermistor
- *
- * @return {Promise} A promise for info on the vehicle's interiorThermistor
- */
-Vehicle.prototype.interiorThermistor = function() {
-  return util.wrap(this.request.get('thermistors/interior'));
-};
-
-/**
- * GET Vehicle.exteriorThermistor
- *
- * @return {Promise} A promise for info on the vehicle's exteriorThermistor
- */
-Vehicle.prototype.exteriorThermistor = function() {
-  return util.wrap(this.request.get('thermistors/exterior'));
-};
-
-/**
- * GET Vehicle.tires
- *
- * @return {Promise} A promise for info on the vehicle's tires
- */
-Vehicle.prototype.tires = function() {
-  return util.wrap(this.request.get('tires'));
-};
-
-/**
- * GET Vehicle.transmission
- *
- * @return {Promise} A promise for info on the vehicle's transmission
- */
-Vehicle.prototype.transmission = function() {
-  return util.wrap(this.request.get('transmission'));
-};
-
-/**
- * GET Vehicle.transmissionFluid
- *
- * @return {Promise} A promise for info on the vehicle's transmissionFluid
- */
-Vehicle.prototype.transmissionFluid = function() {
-  return util.wrap(this.request.get('transmission/fluid'));
-};
-
-/**
- * GET Vehicle.frontTrunk
- *
- * @return {Promise} A promise for info on the vehicle's frontTrunk
- */
-Vehicle.prototype.frontTrunk = function() {
-  return util.wrap(this.request.get('trunks/front'));
-};
-
-/**
- * GET Vehicle.rearTrunk
- *
- * @return {Promise} A promise for info on the vehicle's rearTrunk
- */
-Vehicle.prototype.rearTrunk = function() {
-  return util.wrap(this.request.get('trunks/rear'));
-};
-
 /**
  * GET Vehicle.vin
  *
@@ -553,531 +118,25 @@ Vehicle.prototype.vin = function() {
 };
 
 /**
- * GET Vehicle.washerFluid
+ * POST Vehicle.lock
  *
- * @return {Promise} A promise for info on the vehicle's washerFluid
+ * @return {Promise} A success or failure response
  */
-Vehicle.prototype.washerFluid = function() {
-  return util.wrap(this.request.get('washer_fluid'));
+Vehicle.prototype.lock = function() {
+  return util.wrap(this.request.post('security', {
+    body: {action: 'LOCK'},
+  }));
 };
 
 /**
- * GET Vehicle.wheels
+ * POST Vehicle.unlock
  *
- * @return {Promise} A promise for info on the vehicle's wheels
+ * @return {Promise} A success or failure response
  */
-Vehicle.prototype.wheels = function() {
-  return util.wrap(this.request.get('wheels'));
+Vehicle.prototype.unlock = function() {
+  return util.wrap(this.request.post('security', {
+    body: {action: 'UNLOCK'},
+  }));
 };
 
-/**
- * GET Vehicle.wheelSpeeds
- *
- * @return {Promise} A promise for info on the vehicle's wheelSpeeds
- */
-Vehicle.prototype.wheelSpeeds = function() {
-  return util.wrap(this.request.get('wheels/speeds'));
-};
-
-/**
- * GET Vehicle.windows
- *
- * @return {Promise} A promise for info on the vehicle's windows
- */
-Vehicle.prototype.windows = function() {
-  return util.wrap(this.request.get('windows'));
-};
-
-/**
- * POST Vehicle.startCharging
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.startCharging = function() {
-  return util.wrap(this.request.post('charge', {
-    body: {action: 'START'},
-  }));
-};
-
-/**
- * POST Vehicle.stopCharging
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.stopCharging = function() {
-  return util.wrap(this.request.post('charge', {
-    body: {action: 'STOP'},
-  }));
-};
-
-/**
- * POST Vehicle.enableChargeLimit
- *
- * @param {Float} [limit] - override the previously set limit,
- *                          must be between 0 - 1
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.enableChargeLimit = function(limit) {
-  return util.wrap(this.request.post('charge/limit', {
-    body: {limit, action: 'ENABLE'},
-  }));
-};
-
-/**
- * POST Vehicle.disableChargeLimit
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.disableChargeLimit = function() {
-  return util.wrap(this.request.post('charge/limit', {
-    body: {action: 'DISABLE'},
-  }));
-};
-
-/**
- * POST Vehicle.enableChargeSchedule
- *
- * @param {String} startTime the datetime string representing when to start
- * charging, i.e, '11:11'
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.enableChargeSchedule = function(startTime) {
-  return util.wrap(this.request.post('charge/schedule', {
-    body: {action: 'ENABLE', startTime},
-  }));
-};
-
-/**
- * POST Vehicle.disableChargeSchedule
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.disableChargeSchedule = function() {
-  return util.wrap(this.request.post('charge/schedule', {
-    body: {action: 'DISABLE'},
-  }));
-};
-
-/**
- * POST Vehicle.activateChildSafetyLocks
- *
- * @param {Array} childSafetyLocksArr array of child safety lock objects,
- * i.e, [{location: 'BACK_LEFT'}]
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.activateChildSafetyLocks = function(childSafetyLocksArr) {
-  // eslint-disable-next-line max-len
-  if (_.isNil(childSafetyLocksArr) || !Array.isArray(childSafetyLocksArr)) {
-    // eslint-disable-next-line max-len
-    throw new TypeError('activateChildSafetyLocks requires an array of safety locks');
-  }
-  return util.wrap(this.request.post('doors/child_safety_locks', {
-    body: {action: 'LOCK', childSafetyLocks: childSafetyLocksArr},
-  }));
-};
-
-/**
- * POST Vehicle.disableChildSafetyLocks
- *
- * @param {Array} childSafetyLocksArr array of child safety lock objects,
- * i.e, [{location: 'BACK_LEFT'}]
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.disableChildSafetyLocks = function(childSafetyLocksArr) {
-  // eslint-disable-next-line max-len
-  if (_.isNil(childSafetyLocksArr) || !Array.isArray(childSafetyLocksArr)) {
-    // eslint-disable-next-line max-len
-    throw new TypeError('disableChildSafetyLocks requires an array of safety locks');
-  }
-  return util.wrap(this.request.post('doors/child_safety_locks', {
-    body: {action: 'UNLOCK', childSafetyLocks: childSafetyLocksArr},
-  }));
-};
-
-/**
- * POST Vehicle.startClimate
- *
- * @param {Number} temperature the temperature to set the car to
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.startClimate = function(temperature) {
-  return util.wrap(this.request.post('climate', {
-    body: {action: 'START', temperature},
-  }));
-};
-
-/**
- * POST Vehicle.stopClimate
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.stopClimate = function() {
-  return util.wrap(this.request.post('climate', {
-    body: {action: 'STOP'},
-  }));
-};
-
-/**
- * POST Vehicle.openEngineHood
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.openEngineHood = function() {
-  return util.wrap(this.request.post('engine/hood', {
-    body: {action: 'OPEN'},
-  }));
-};
-
-/**
- * POST Vehicle.closeEngineHood
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.closeEngineHood = function() {
-  return util.wrap(this.request.post('engine/hood', {
-    body: {action: 'CLOSE'},
-  }));
-};
-
-/**
- * POST Vehicle.honkHorn
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.honkHorn = function() {
-  return util.wrap(this.request.post('horn', {
-    body: {action: 'HONK'},
-  }));
-};
-
-/**
- * POST Vehicle.startIgnition
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.startIgnition = function() {
-  return util.wrap(this.request.post('ignition', {
-    body: {action: 'START'},
-  }));
-};
-
-/**
- * POST Vehicle.setIgnitionOn
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.setIgnitionOn = function() {
-  return util.wrap(this.request.post('ignition', {
-    body: {action: 'ON'},
-  }));
-};
-
-/**
- * POST Vehicle.setIgnitionAccessory
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.setIgnitionAccessory = function() {
-  return util.wrap(this.request.post('ignition', {
-    body: {action: 'ACCESSORY'},
-  }));
-};
-
-/**
- * POST Vehicle.setIgnitionOff
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.setIgnitionOff = function() {
-  return util.wrap(this.request.post('ignition', {
-    body: {action: 'OFF'},
-  }));
-};
-
-/**
- * POST Vehicle.flashHeadlights
- *
- * @param {String} type the type of headlight to perform the action on,
- * i.e 'HIGH_BEAM'
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.flashHeadlights = function(type) {
-  if (_.isNil(type) || typeof type !== 'string') {
-    // eslint-disable-next-line max-len
-    throw new TypeError('flashHeadlights requires a string describing type of flash');
-  }
-  return util.wrap(this.request.post('lights/headlights', {
-    body: {action: 'FLASH', type},
-  }));
-};
-
-/**
- * POST Vehicle.tiltSideviewMirrors
- *
- * @param {Array} mirrorsArr array of mirror objects to perform action on,
- * i.e [{location: 'LEFT'}]
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.tiltSideviewMirrors = function(mirrorsArr) {
-  // eslint-disable-next-line max-len
-  if (_.isNil(mirrorsArr) || !Array.isArray(mirrorsArr)) {
-    // eslint-disable-next-line max-len
-    throw new TypeError('tiltSideviewMirrors requires an array of mirrors');
-  }
-  return util.wrap(this.request.post('mirrors/side_view', {
-    body: {action: 'TILT', mirrors: mirrorsArr},
-  }));
-};
-
-/**
- * POST Vehicle.startPanic
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.startPanic = function() {
-  return util.wrap(this.request.post('panic', {
-    body: {action: 'START'},
-  }));
-};
-
-/**
- * POST Vehicle.stopPanic
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.stopPanic = function() {
-  return util.wrap(this.request.post('panic', {
-    body: {action: 'STOP'},
-  }));
-};
-
-/**
- * POST Vehicle.openChargePort
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.openChargePort = function() {
-  return util.wrap(this.request.post('ports/charge', {
-    body: {action: 'OPEN'},
-  }));
-};
-
-/**
- * POST Vehicle.closeChargePort
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.closeChargePort = function() {
-  return util.wrap(this.request.post('ports/charge', {
-    body: {action: 'CLOSE'},
-  }));
-};
-
-/**
- * POST Vehicle.openFuelPort
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.openFuelPort = function() {
-  return util.wrap(this.request.post('ports/fuel', {
-    body: {action: 'OPEN'},
-  }));
-};
-
-/**
- * POST Vehicle.closeFuelPort
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.closeFuelPort = function() {
-  return util.wrap(this.request.post('ports/fuel', {
-    body: {action: 'CLOSE'},
-  }));
-};
-
-/**
- * POST Vehicle.lock
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.lock = function() {
-  return util.wrap(this.request.post('security', {
-    body: {action: 'LOCK'},
-  }));
-};
-
-/**
- * POST Vehicle.unlock
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.unlock = function() {
-  return util.wrap(this.request.post('security', {
-    body: {action: 'UNLOCK'},
-  }));
-};
-
-/**
- * POST Vehicle.openSunroof
- *
- * @param {Number} percentOpen max: 1, min: 0
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.openSunroof = function(percentOpen) {
-
-  if (!_.isNumber(percentOpen)) {
-    throw new TypeError('"percentOpen" argument must be a number');
-  }
-
-  return util.wrap(this.request.post('sunroof', {
-    body: {action: 'OPEN', percentOpen},
-  }));
-};
-
-/**
- * POST Vehicle.ventSunroof
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.ventSunroof = function() {
-  return util.wrap(this.request.post('sunroof', {
-    body: {action: 'VENT'},
-  }));
-};
-
-/**
- * POST Vehicle.closeSunroof
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.closeSunroof = function() {
-  return util.wrap(this.request.post('sunroof', {
-    body: {action: 'CLOSE'},
-  }));
-};
-
-/**
- * POST Vehicle.openFrontTrunk
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.openFrontTrunk = function() {
-  return util.wrap(this.request.post('trunks/front', {
-    body: {action: 'OPEN'},
-  }));
-};
-
-/**
- * POST Vehicle.closeFrontTrunk
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.closeFrontTrunk = function() {
-  return util.wrap(this.request.post('trunks/front', {
-    body: {action: 'CLOSE'},
-  }));
-};
-
-/**
- * POST Vehicle.openRearTrunk
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.openRearTrunk = function() {
-  return util.wrap(this.request.post('trunks/rear', {
-    body: {action: 'OPEN'},
-  }));
-};
-
-/**
- * POST Vehicle.closeRearTrunk
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.closeRearTrunk = function() {
-  return util.wrap(this.request.post('trunks/rear', {
-    body: {action: 'CLOSE'},
-  }));
-};
-
-/**
- * POST Vehicle.openWindows
- *
- * @param {Array} windowsArr array of window objects to perform action upon,
- * i.e [{location: 'BACK_LEFT'}, {location: 'FRONT_RIGHT'}]
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.openWindows = function(windowsArr) {
-  if (_.isNil(windowsArr) || !Array.isArray(windowsArr)) {
-    // eslint-disable-next-line max-len
-    throw new TypeError('openWindows requires an array of windows');
-  }
-  return util.wrap(this.request.post('windows', {
-    body: {action: 'OPEN', windows: windowsArr},
-  }));
-};
-
-/**
- * POST Vehicle.closeWindows
- *
- * @param {Array} windowsArr array of window objects to perform action upon,
- * i.e [{location: 'BACK_LEFT'}, {location: 'FRONT_RIGHT'}]
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.closeWindows = function(windowsArr) {
-  if (_.isNil(windowsArr) || !Array.isArray(windowsArr)) {
-    // eslint-disable-next-line max-len
-    throw new TypeError('closeWindows requires an array of windows');
-  }
-  return util.wrap(this.request.post('windows', {
-    body: {action: 'CLOSE', windows: windowsArr},
-  }));
-};
-
-/**
- * POST Vehicle.lockWindows
- *
- * @param {Array} windowsArr array of window objects to perform action upon,
- * i.e [{location: 'BACK_LEFT'}, {location: 'FRONT_RIGHT'}]
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.lockWindows = function(windowsArr) {
-  if (_.isNil(windowsArr) || !Array.isArray(windowsArr)) {
-    // eslint-disable-next-line max-len
-    throw new TypeError('lockWindows requires an array of windows');
-  }
-  return util.wrap(this.request.post('windows', {
-    body: {action: 'LOCK', windows: windowsArr},
-  }));
-};
-
-/**
- * POST Vehicle.unlockWindows
- *
- * @param {Array} windowsArr array of window objects to perform action upon,
- * i.e [{location: 'BACK_LEFT'}, {location: 'FRONT_RIGHT'}]
- *
- * @return {Promise} A success or failure response
- */
-Vehicle.prototype.unlockWindows = function(windowsArr) {
-  if (_.isNil(windowsArr) || !Array.isArray(windowsArr)) {
-    // eslint-disable-next-line max-len
-    throw new TypeError('windowsArr requires an array of windows');
-  }
-  return util.wrap(this.request.post('windows', {
-    body: {action: 'UNLOCK', windows: windowsArr},
-  }));
-};
-
-
 module.exports = Vehicle;
diff --git a/test/lib/vehicle-api-param-methods.js b/test/lib/vehicle-api-param-methods.js
deleted file mode 100644
index 7edf6699..00000000
--- a/test/lib/vehicle-api-param-methods.js
+++ /dev/null
@@ -1,195 +0,0 @@
-'use strict';
-
-const Promise = require('bluebird');
-const _ = require('lodash');
-const nock = require('nock');
-const test = require('ava');
-
-const Vehicle = require('../../lib/vehicle');
-const config = require('../../lib/config');
-
-const VID = 'c8d7e7bc-22ef-4ebe-87ab-f2193c94c9b9';
-const TOKEN = 'fde1666c-5090-4494-8b0d-ec396db9e4d7';
-const USER_AGENT = `smartcar-node-sdk:${config.version}`;
-
-const vehicle = new Vehicle(VID, TOKEN);
-
-const nocks = {
-  base(endpoint, body) {
-    return nock(`https://api.smartcar.com/v1.0/vehicles/${VID}`)
-      .matchHeader('User-Agent', USER_AGENT)
-      .matchHeader('Authorization', `Bearer ${TOKEN}`)
-      .post(endpoint, body)
-      .reply(200, {status: 'success'});
-  },
-};
-
-test.before(() => nock.disableNetConnect());
-test.after(() => nock.cleanAll());
-
-const optionalArguments = [
-  'startClimate',
-  'updateRequest',
-  'enableChargeLimit',
-  'enableChargeSchedule',
-];
-
-// test all the methods that do not require any arguments
-_.forEach(Vehicle.prototype, function(method, name) {
-
-  if (!method.length || _.includes(optionalArguments, name)) {
-    return;
-  }
-
-  test(`${name} - throws error on invalid params`, function(t) {
-    return Promise.join(
-      t.throws(() => vehicle[name](), TypeError),
-      t.throws(() => vehicle[name]({}), TypeError)
-    );
-  });
-
-});
-
-test('flashHeadlights', async function(t) {
-
-  const body = {
-    action: 'FLASH',
-    type: 'HIGH_BEAM',
-  };
-
-  t.context.n = nocks.base('/lights/headlights', body);
-  const response = await vehicle.flashHeadlights(body.type);
-  t.is(response.status, 'success');
-
-});
-
-test('activateChildSafetyLocks', async function(t) {
-
-  const body = {
-    action: 'LOCK',
-    childSafetyLocks: [{location: 'BACK_LEFT'}],
-  };
-
-  t.context.n = nocks.base('/doors/child_safety_locks', body);
-  const response = await vehicle.activateChildSafetyLocks(
-    body.childSafetyLocks
-  );
-  t.is(response.status, 'success');
-
-});
-
-test('disableChildSafetyLocks', async function(t) {
-
-  const body = {
-    action: 'UNLOCK',
-    childSafetyLocks: [{location: 'BACK_LEFT'}],
-  };
-
-  t.context.n = nocks.base('/doors/child_safety_locks', body);
-  const response = await vehicle.disableChildSafetyLocks(body.childSafetyLocks);
-  t.is(response.status, 'success');
-
-});
-
-test('tiltSideviewMirrors', async function(t) {
-
-  const body = {
-    action: 'TILT',
-    mirrors: [{location: 'LEFT'}],
-  };
-
-  t.context.n = nocks.base('/mirrors/side_view', body);
-  const response = await vehicle.tiltSideviewMirrors(body.mirrors);
-  t.is(response.status, 'success');
-
-});
-
-test('openWindows', async function(t) {
-
-  const body = {
-    action: 'OPEN',
-    windows: [{location: 'BACK_LEFT'}],
-  };
-
-  t.context.n = nocks.base('/windows', body);
-  const response = await vehicle.openWindows(body.windows);
-  t.is(response.status, 'success');
-
-});
-
-test('closeWindows', async function(t) {
-
-  const body = {
-    action: 'CLOSE',
-    windows: [{location: 'BACK_LEFT'}],
-  };
-
-  t.context.n = nocks.base('/windows', body);
-  const response = await vehicle.closeWindows(body.windows);
-  t.is(response.status, 'success');
-
-});
-
-test('unlockWindows', async function(t) {
-
-  const body = {
-    action: 'UNLOCK',
-    windows: [{location: 'BACK_LEFT'}],
-  };
-
-  t.context.n = nocks.base('/windows', body);
-  const response = await vehicle.unlockWindows(body.windows);
-  t.is(response.status, 'success');
-
-});
-
-test('lockWindows', async function(t) {
-
-  const body = {
-    action: 'LOCK',
-    windows: [{location: 'BACK_LEFT'}],
-  };
-
-  t.context.n = nocks.base('/windows', body);
-  const response = await vehicle.lockWindows(body.windows);
-  t.is(response.status, 'success');
-
-});
-
-test('enableChargeLimit', async function(t) {
-
-  const body = {
-    action: 'ENABLE',
-    limit: 0.5,
-  };
-
-  t.context.n = nocks.base('/charge/limit', body);
-  const response = await vehicle.enableChargeLimit(body.limit);
-  t.is(response.status, 'success');
-
-});
-
-test('enableChargeSchedule', async function(t) {
-
-  const body = {
-    action: 'ENABLE',
-    startTime: '11:11',
-  };
-  t.context.n = nocks.base('/charge/schedule', body);
-  const response = await vehicle.enableChargeSchedule(body.startTime);
-  t.is(response.status, 'success');
-
-});
-
-test('startClimate', async function(t) {
-
-  const body = {
-    action: 'START',
-    temperature: 32.5,
-  };
-
-  t.context.n = nocks.base('/climate', body);
-  const response = await vehicle.startClimate(body.temperature);
-  t.is(response.status, 'success');
-
-});
diff --git a/test/lib/vehicle.js b/test/lib/vehicle.js
index 27b1ec95..fcb1630d 100644
--- a/test/lib/vehicle.js
+++ b/test/lib/vehicle.js
@@ -135,24 +135,10 @@ test('permissions', async function(t) {
 test('action with no argument', async function(t) {
 
   t.context.nock = nocks.base()
-    .post('/panic', {action: 'START'})
+    .post('/security', {action: 'LOCK'})
     .reply(200, {status: 'success'});
 
-  const response = await vehicle.startPanic();
-  t.is(response.status, 'success');
-
-});
-
-test('action with a key and argument', async function(t) {
-
-  t.context.n = nocks.base()
-    .post('/sunroof', {
-      action: 'OPEN',
-      percentOpen: 0.5,
-    })
-    .reply(200, {status: 'success'});
-
-  const response = await vehicle.openSunroof(0.5);
+  const response = await vehicle.lock();
   t.is(response.status, 'success');
 
 });