diff --git a/.gitignore b/.gitignore
index b87a2cb4..f265a250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 dist
 docs
+*.log
diff --git a/can-validate.build.js b/can-validate.build.js
index cf036dbb..76fae14d 100644
--- a/can-validate.build.js
+++ b/can-validate.build.js
@@ -1,11 +1,15 @@
+var canValidate = require('./can-validate/can-validate');
+var validate = require('./can-validate/map/validate/validate');
+var validateJsShim = require('./can-validate/shims/validatejs.shim');
+
 module.exports = {
 	'can-validate': {
-		'can-validate': require('./can-validate/can-validate')
+		'can-validate': canValidate
 	},
-	map: {
-		validate: require('./can-validate/map/validate/validate')
+	'map': {
+		validate: validate
 	},
-	shims: {
-		'validatejs.shim': require('./can-validate/shims/validatejs.shim')
+	'shims': {
+		'validatejs.shim': validateJsShim
 	}
-}
+};
diff --git a/can-validate/can-validate.js b/can-validate/can-validate.js
index 6ff46f17..ef5cfebb 100644
--- a/can-validate/can-validate.js
+++ b/can-validate/can-validate.js
@@ -37,9 +37,8 @@
 import can from 'can';
 
 var processMapDefine = function (targetMap) {
-	var targetDefine = targetMap.define,
-		resp = {values: {}, opts: {}};
-
+	var targetDefine = targetMap.define;
+	var resp = {values: {}, opts: {}};
 	can.each(targetDefine, function (item, prop) {
 		resp.values[prop] = targetMap.attr(prop);
 		resp.opts[prop] = item.validate;
@@ -48,8 +47,8 @@ var processMapDefine = function (targetMap) {
 	return resp;
 };
 
-//add methods to can
-var Validate = can.validate = can.Construct.extend({
+// add methods to can
+var Validate = can.Construct.extend({
 
 	/*
 	* @description The current validator ID to use when can.validate methods are called.
@@ -62,103 +61,103 @@ var Validate = can.validate = can.Construct.extend({
 	_validators: {},
 
 	/**
-	 * @function can-validate.validator Validator
-	 * @parent can-validate.utils
-	 * @description Registers a library with can.validate. The last one registered is the default library.
-	 * Override the default by changing `_validatorId` to the key of the desired registered library.
-	 * ```js
-	 * Validate.register('validatejs',validatejs);
-	 * ```
-	 * @param {string} id The key name of the validator library.
-	 * @param {object|function} validator The validator libarary. Only pass instances.
-	 */
+	* @function can-validate.validator Validator
+	* @parent can-validate.utils
+	* @description Registers a library with can.validate. The last one registered is the default library.
+	* Override the default by changing `_validatorId` to the key of the desired registered library.
+	* ```js
+	* Validate.register('validatejs',validatejs);
+	* ```
+	* @param {string} id The key name of the validator library.
+	* @param {object|function} validator The validator libarary. Only pass instances.
+	*/
 	validator: function () {
-			return this._validators[this._validatorId];
+		return this._validators[this._validatorId];
 	},
 
 	/**
-	 * @function can-validate.register Register
-	 * @parent can-validate.utils
-	 * @description Registers a library with can.validate. The last one registered is the default library.
-	 * Override the default by changing `_validatorId` to the key of the desired registered library.
-	 * ```js
-	 * Validate.register('validatejs',validatejs);
-	 * ```
-	 * @param {string} id The key name of the validator library.
-	 * @param {object|function} validator The validator libarary. Only pass instances.
-	 */
+	* @function can-validate.register Register
+	* @parent can-validate.utils
+	* @description Registers a library with can.validate. The last one registered is the default library.
+	* Override the default by changing `_validatorId` to the key of the desired registered library.
+	* ```js
+	* Validate.register('validatejs',validatejs);
+	* ```
+	* @param {string} id The key name of the validator library.
+	* @param {object|function} validator The validator libarary. Only pass instances.
+	*/
 	register: function (id, validator) {
 		this._validatorId = id;
 		this._validators[id] = validator;
 	},
 
 	/**
-	 * @function can-validate.isValid Is Valid
-	 * @parent can-validate.validators
-	 * @description Registers a library with can.validate. The last one registered is the default library.
-	 * Override the default by changing `_validatorId` to the key of the desired registered library.
-	 * ```js
-	 * Validate.isValid('', {}, 'myVal');
-	 * ```
-	 * @param {*} value A value of any type to validate.
-	 * @param {object} options Validation config object, structure depends on the
-	 *  validation library used.
-	 * @param {string} name Optional. The key name of the value.
-	 */
+	* @function can-validate.isValid Is Valid
+	* @parent can-validate.validators
+	* @description Registers a library with can.validate. The last one registered is the default library.
+	* Override the default by changing `_validatorId` to the key of the desired registered library.
+	* ```js
+	* Validate.isValid('', {}, 'myVal');
+	* ```
+	* @param {*} value A value of any type to validate.
+	* @param {object} options Validation config object, structure depends on the
+	*  validation library used.
+	* @param {string} name Optional. The key name of the value.
+	*/
 	isValid: function () {
 		//!steal-remove-start
-		if (!this._validatorId ) {
-			can.dev.warn("A validator library is required for can.validate to work properly.");
+		if (!this._validatorId) {
+			can.dev.warn('A validator library is required for can.validate to work properly.');
 		}
 		//!steal-remove-end
 		return this.validator().isValid.apply(this, arguments);
 	},
 
 	/**
-	 * @function can-validate.once Once
-	 * @parent can-validate.validators
-	 * @description Registers a library with can.validate. The last one registered is the default library.
-	 * Override the default by changing `_validatorId` to the key of the desired registered library.
-	 * ```js
-	 * Validate.once('', {}, 'myVal');
-	 * ```
-	 * @param {*} value A value of any type to validate.
-	 * @param {object} options Validation config object, structure depends on the
-	 *  validation library used.
-	 * @param {string} name Optional. The key name of the value.
-	 */
+	* @function can-validate.once Once
+	* @parent can-validate.validators
+	* @description Registers a library with can.validate. The last one registered is the default library.
+	* Override the default by changing `_validatorId` to the key of the desired registered library.
+	* ```js
+	* Validate.once('', {}, 'myVal');
+	* ```
+	* @param {*} value A value of any type to validate.
+	* @param {object} options Validation config object, structure depends on the
+	*  validation library used.
+	* @param {string} name Optional. The key name of the value.
+	*/
 	once: function () {
 		//!steal-remove-start
-		if (!this._validatorId ) {
-			can.dev.warn("A validator library is required for can.validate to work properly.");
+		if (!this._validatorId) {
+			can.dev.warn('A validator library is required for can.validate to work properly.');
 		}
 		//!steal-remove-end
 		return this.validator().once.apply(this, arguments);
 	},
 
 	/**
-	 * @function can-validate.validate Validate
-	 * @parent can-validate.validators
-	 * @description
-	 * ```js
-	 * Validate.validate({},{});
-	 * ```
-	 * @param {object} values A map of the different objects to validate.
-	 * @param {object} options Validation config object, structure depends on the
-	 *  validation library used.
-	 */
+	* @function can-validate.validate Validate
+	* @parent can-validate.validators
+	* @description
+	* ```js
+	* Validate.validate({},{});
+	* ```
+	* @param {object} values A map of the different objects to validate.
+	* @param {object} options Validation config object, structure depends on the
+	*  validation library used.
+	*/
 	validate: function () {
 		var validateArgs = arguments;
 		//!steal-remove-start
-		if (!this._validatorId ) {
-			can.dev.warn("A validator library is required for can.validate to work properly.");
+		if (!this._validatorId) {
+			can.dev.warn('A validator library is required for can.validate to work properly.');
 		}
-		if ( typeof arguments[0] !== 'object' ) {
-			can.dev.warn("Attempting to pass single value to validate, use can.validator.once instead.");
+		if (typeof arguments[0] !== 'object') {
+			can.dev.warn('Attempting to pass single value to validate, use can.validator.once instead.');
 		}
 		//!steal-remove-end
 
-		//check if can.map was passed, verify if there are validate options
+		// check if can.map was passed, verify if there are validate options
 		// defined then validate all applicable props.
 		if (arguments[0] instanceof can.Map && arguments[0].define) {
 			var mapOptions = processMapDefine(arguments[0]);
@@ -167,8 +166,9 @@ var Validate = can.validate = can.Construct.extend({
 			validateArgs.push(mapOptions.opts);
 		}
 		return this.validator().validate.apply(this, validateArgs);
-
 	}
-},{});
+}, {});
+
+can.validate = Validate;
 
 export default can;
diff --git a/can-validate/map/validate/demo.html b/can-validate/map/validate/demo.html
index a68f05ac..0104b94c 100644
--- a/can-validate/map/validate/demo.html
+++ b/can-validate/map/validate/demo.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<meta charset="utf-8">
-	<title>Memory Leak Test</title>
+	<title>can-validate Map Plugin Demo</title>
 	<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
 	<style>
 		#app {
@@ -30,9 +30,13 @@ <h3 class="panel-title">Validation Test</h3>
 				<div class="panel-body">
 					<p>Validation happens when a property&rsquo;s setter is called.
 					In the following examples, this happens when the field&rsquo;s value changes.</p>
+					<div class="form-group">
+						<label for="test1">MyVal required?</label>
+						<input class="form-control" id="test" type="checkbox" can-value="myMap.isRequired">
+					</div>
 					<div class="form-group">
 						<label for="test1">MyVal</label>
-						<input class="form-control" id="test" type="text" can-value="myMap.myVal">
+						<input class="form-control" id="test1" type="text" can-value="myMap.myVal">
 					</div>
 					<div class="form-group">
 						<label for="test2">MyNum</label>
@@ -65,9 +69,8 @@ <h3 class="panel-title">Validation Test</h3>
 					myVal: {
 						value: 'hello',
 						validate: {
-							required: true,
-							length: {
-								minimum: 6
+							required: function () {
+								return this.attr('isRequired') || false;
 							}
 						}
 					},
@@ -77,8 +80,13 @@ <h3 class="panel-title">Validation Test</h3>
 							required: true,
 							numericality: {
 								greaterThan: 5
-							}
+							},
+							validateOnInit: true
 						}
+					},
+					isRequired: {
+						value: false,
+						type: 'boolean'
 					}
 				}
 			});
diff --git a/can-validate/map/validate/validate.js b/can-validate/map/validate/validate.js
index 8b8e28d7..ad50a034 100644
--- a/can-validate/map/validate/validate.js
+++ b/can-validate/map/validate/validate.js
@@ -26,85 +26,165 @@
 import can from 'can';
 import 'can-validate/can-validate';
 
-var proto = can.Map.prototype,
-	oldSet = proto.__set,
-	getPropDefineBehavior = function(behavior, attr, define) {
-		var prop, defaultProp;
+var proto = can.Map.prototype;
+var oldSet = proto.__set;
+var ErrorsObj;
+var defaultValidationOpts;
+
+var isMapInitializing = function () {
+	var initing = false;
+	// Pre 2.3
+	if (this._init) {
+		initing = this._init === 1 || false;
+	}
 
-		if(define) {
-			prop = define[attr];
-			defaultProp = define['*'];
+	// 2.3
+	if (this._initializing) {
+		initing = this._initializing;
+	}
 
-			if(prop && prop[behavior] !== undefined) {
-				return prop[behavior];
-			}
-			else if(defaultProp && defaultProp[behavior] !== undefined) {
+	// post 2.3
+	if (this.__inSetup) {
+		initing = this.__inSetup;
+	}
+
+	return initing;
+};
+
+// Gets properties from the map's define property.
+var getPropDefineBehavior = function (behavior, attr, define) {
+	var prop;
+	var defaultProp;
+
+	if (define) {
+		prop = define[attr];
+		defaultProp = define['*'];
+
+		if (prop && prop[behavior] !== undefined) {
+			return prop[behavior];
+		} else {
+			if (defaultProp && defaultProp[behavior] !== undefined) {
 				return defaultProp[behavior];
 			}
 		}
-	};
+	}
+};
 
-var ErrorsObj = can.Map.extend({},{
+// Default Map for errors object. Useful to add instance helpers
+ErrorsObj = can.Map.extend({}, {
 	hasErrors: function () {
 		return !can.isEmptyObject(this.attr());
 	}
 });
 
-var defaultValidationOpts = {
+// Default validation options to extend passed options from
+defaultValidationOpts = {
 	mustValidate: false,
 	validateOnInit: false
-}
+};
 
-// add method to prototype that valdiates entire map
+// add method to prototype that validates entire map
 can.extend(can.Map.prototype, {
 	validate: function () {
+		return this._validate();
+	},
+	_validate: function () {
 		var errors = can.validate.validate(this);
 
 		// Process errors if we got them
 		this.attr('errors', new ErrorsObj(errors));
 
 		return can.isEmptyObject(errors);
-	}
-});
-
-// Override the prototype's __set with a more validate-y one.
-proto.__set = function (prop, value, current, success, error) {
-
-	// allowSet is changed only if validation options exist and validation returns errors
-	var allowSet = true,
-		validateOpts = getPropDefineBehavior("validate", prop, this.define),
-		processedValidateOptions = can.extend({},defaultValidationOpts,validateOpts),
-		defaultValue = getPropDefineBehavior("value", prop, this.define),
-		propIniting = (this._init && this._init === 1) || false,
-		errors;
-
-	// If validate opts are set and not initing, validate properties
-	// If validate opts are set and initing, validate properties only if validateOnInit is true
-	if((validateOpts && !propIniting) || (validateOpts && propIniting && processedValidateOptions.validateOnInit )  ) {
+	},
+	_validateOne: function (item, opts) {
+		var errors;
+		var allowSet = true;
 
 		// run validation
-		errors = can.validate.once(value, can.extend({},processedValidateOptions), prop);
+		errors = can.validate.once(item.value, can.extend({}, opts), item.key);
 
 		// Process errors if we got them
-		if(errors && errors.length > 0) {
-
+		if (errors && errors.length > 0) {
 			// Create errors property if doesn't exist
-			if(!this.attr('errors')) {
+			if (!this.attr('errors')) {
 				this.attr('errors', new ErrorsObj({}));
 			}
 
 			// Apply error response to observable
-			this.attr('errors').attr(prop,errors);
+			this.attr('errors').attr(item.key, errors);
 
 			// Don't set value if `mustValidate` is true
-			if (processedValidateOptions.mustValidate === true) {
+			if (opts.mustValidate === true) {
 				allowSet = false;
 			}
 		} else {
 			// clear errors for this property if they exist
-			if(this.attr('errors') && this.attr('errors').attr(prop) ) {
-				this.attr('errors').removeAttr(prop);
+			if (this.attr('errors') && this.attr('errors').attr(item.key)) {
+				this.attr('errors').removeAttr(item.key);
+			}
+		}
+
+		return allowSet;
+	},
+	// _computeChange: function (key) {
+	// 	var
+	// },
+	// Processes validation options, creates computes from functions and adds listeners
+	_processValidateOpts: function (itemObj, opts) {
+		var processedObj = {};
+		var computes = [];
+		var vm = this;
+
+		// Loop through each validation option
+		can.each(opts, function (item, key) {
+			var actualOpts = item;
+			if (typeof item === 'function') {
+				// create compute and add it to computes array
+				var compute = can.compute(can.proxy(item, vm));
+				//actualOpts = compute(itemObj.value);
+				actualOpts = compute;
+				computes.push({key: key, compute: compute});
 			}
+			// build the map for the final validations object
+			processedObj[key] = actualOpts;
+		});
+
+		// Using the computes array, create necessary listeners
+		// We do this afterwards instead of inline so we can have access
+		// to the final set of validation options.
+		can.each(computes, function (item) {
+			item.compute.bind('change', function (ev, newVal) {
+				processedObj[item.key] = newVal;
+				itemObj.value = vm.attr(itemObj.key);
+				vm._validateOne(itemObj, processedObj);
+			});
+		});
+		return processedObj;
+	}
+});
+
+// Override the prototype's __set with a more validate-y one.
+proto.__set = function (prop, value, current, success, error) {
+	// allowSet is changed only if validation options exist and validation returns errors
+	var allowSet = true;
+	var validateOpts = getPropDefineBehavior('validate', prop, this.define);
+	var propIniting = isMapInitializing.call(this);
+
+	if (typeof validateOpts !== 'undefined') {
+		//create validation computes
+		if (propIniting) {
+			validateOpts = can.extend({},
+				defaultValidationOpts,
+				validateOpts,
+				this._processValidateOpts({key: prop, value: value}, validateOpts)
+			);
+			this.define[prop].validate = validateOpts;
+		}
+		// If validate opts are set and not initing, validate properties
+		// If validate opts are set and initing, validate properties only if validateOnInit is true
+		if ((validateOpts && !propIniting) || (validateOpts && propIniting && validateOpts.validateOnInit)) {
+			// Validate item
+			allowSet = this._validateOne({key: prop, value: value}, validateOpts);
 		}
 	}
 
@@ -112,5 +192,4 @@ proto.__set = function (prop, value, current, success, error) {
 	if (allowSet) {
 		oldSet.call(this, prop, value, current, success, error);
 	}
-
 };
diff --git a/can-validate/shims/validatejs.shim.js b/can-validate/shims/validatejs.shim.js
index 83dcc31b..68f29750 100644
--- a/can-validate/shims/validatejs.shim.js
+++ b/can-validate/shims/validatejs.shim.js
@@ -7,25 +7,23 @@
 *
 */
 
-import can from 'can';
+//import can from 'can';
+import can from 'can-validate/can-validate';
 import validatejs from 'validate.js';
 
-//add shim
-function processOptions(opts){
-	//check required
-	if (opts.required) {
-		opts.presence = true;
-		if (typeof opts.required === 'object') {
-			opts.presence = opts.required;
-		}
+// add shim
+var processOptions = function (opts) {
+	// check required
+	if (typeof opts.required !== 'undefined') {
+		opts.presence = opts.required;
 		delete opts.required;
 	}
 
-	if (opts.hasOwnProperty('mustValidate') ) {
+	if (opts.hasOwnProperty('mustValidate')) {
 		delete opts.mustValidate;
 	}
 
-	if (opts.hasOwnProperty('validateOnInit') ) {
+	if (opts.hasOwnProperty('validateOnInit')) {
 		delete opts.validateOnInit;
 	}
 
@@ -52,13 +50,14 @@ var Shim = can.Construct.extend({
 		return errors.length === 0;
 	},
 	validate: function (values, options) {
-		var valueKeys = Object.keys(values), // <ie9 solution?
-			processedOpts = {};
+		// <ie9 solution?
+		var valueKeys = Object.keys(values);
+		var processedOpts = {};
 
 		// process options for each value
 		for (var i = 0; i < valueKeys.length; i++) {
 			var prop = valueKeys[i];
-			if ( options[prop] ) {
+			if (options[prop]) {
 				processedOpts[prop] = processOptions(options[prop]);
 			}
 		}
diff --git a/can-validate/shims/validatejs.test.js b/can-validate/shims/validatejs.test.js
index cdd692d2..3a7772d4 100644
--- a/can-validate/shims/validatejs.test.js
+++ b/can-validate/shims/validatejs.test.js
@@ -26,13 +26,11 @@ var ValidatedMap = can.Map.extend({
 var test = new ValidatedMap({});
 
 test('validate on init', function () {
-	equal(test.errors['myNumber'].length, 1, 'Validate ran successfully on init.');
+	equal(test.errors.myNumber.length, 1, 'Validate ran successfully on init.');
 });
 
-
 test('validate', function () {
-	equal(test.errors['myString'], undefined, 'Does not validate on init by default.');
+	equal(test.errors.myString, undefined, 'Does not validate on init by default.');
 	test.attr('myString', 'a');
-	equal(test.errors['myString'].length, 1, 'Validate ran successfully on change of value.');
-
+	equal(test.errors.myString.length, 1, 'Validate ran successfully on change of value.');
 });
diff --git a/can-validate/shims/validations.shim.js b/can-validate/shims/validations.shim.js
index eed40beb..3379590d 100644
--- a/can-validate/shims/validations.shim.js
+++ b/can-validate/shims/validations.shim.js
@@ -7,8 +7,7 @@
 *
 */
 
-
-//add shim
+// add shim
 steal('can', 'can-validate/validations', 'can-validate', 'can/observe', function (can, Validations) {
 	//var validate = new Validations();
 	var Shim = can.Construct.extend({
diff --git a/can-validate/validate.test.js b/can-validate/validate.test.js
index 42edcb32..8c5c0a7b 100644
--- a/can-validate/validate.test.js
+++ b/can-validate/validate.test.js
@@ -3,16 +3,15 @@ import can from 'can';
 import 'can-validate/can-validate';
 import 'steal-qunit';
 
-
 var Shim = can.Construct.extend({
 	once: function (value, options, name) {
-		return {v:value, o:options, n:name};
+		return {v: value, o: options, n: name};
 	},
 	isValid: function (value, options) {
-		return {v:value, o:options};
+		return {v: value, o: options};
 	},
 	validate: function (values, options) {
-		return {v:values, o:options};
+		return {v: values, o: options};
 	}
 });
 
@@ -35,5 +34,4 @@ test('validate', function () {
 	var errors = can.validate.validate('foo', 'bar');
 	equal(errors.v, 'foo', 'Value argument passed to shim.');
 	equal(errors.o, 'bar', 'Options argument passed to shim.');
-
 });
diff --git a/can-validate/validations/validations.js b/can-validate/validations/validations.js
index 54642fcb..28b689dd 100644
--- a/can-validate/validations/validations.js
+++ b/can-validate/validations/validations.js
@@ -7,45 +7,41 @@
 *
 */
 
+var validate;
+var proc;
+var attrName;
 
-//Copies old map validation plugin stuff
+// Copies old map validation plugin stuff
 steal('can', function (can) {
-
-	//validations object is by property.  You can have validations that
-	//span properties, but this way we know which ones to run.
+	// validations object is by property.  You can have validations that
+	// span properties, but this way we know which ones to run.
 	//  proc should return true if there's an error or the error message
 
 	return can.Construct.extend({
 		once: function (value, options, key) {
 			var errors = [];
-			// normalize argumetns
-			if (!proc) {
-				proc = options;
-				options = {};
-			}
 
 			errors.push(function (newVal) {
 				// if options has a message return that, otherwise, return the error
 				var res = proc.call(this, newVal, attrName);
-				return res === undefined ? undefined : options.message || res;
+				return res === undefined ? undefined : key + options.message || res;
 			});
 		},
 
 		validate: function (values, options) {
-			var errors=[];
+			var errors = [];
 			options = options || {};
 
 			can.each(values, function (attrName) {
 				var opts = options[attrName];
+				var validator;
 				// Add a test function for each attribute
 				if (!errors[attrName]) {
 					errors[attrName] = [];
 				}
 
 				opts.each(function (opt, key) {
-					var validator = 'validate' + can.capitalize(key) + 'Of';
-
-
+					validator = validator + 'validate' + can.capitalize(key) + 'Of';
 				});
 
 				errors[attrName].push(function (newVal) {
@@ -74,13 +70,14 @@ steal('can', function (can) {
 			});
 		},
 		validateInclusionOf: function (attrNames, inArray, options) {
-			validate.call(this, attrNames, options, function (value) {
+			return validate.call(this, attrNames, options, function (value) {
+				var resp;
 				if (typeof value === 'undefined') {
-					return;
+					return resp;
 				}
 				for (var i = 0; i < inArray.length; i++) {
 					if (inArray[i] === value) {
-						return;
+						return resp;
 					}
 				}
 				return this.constructor.validationMessages.inclusion;
@@ -117,5 +114,5 @@ steal('can', function (can) {
 				}
 			});
 		}
-	},{});
+	}, {});
 });
diff --git a/package.json b/package.json
index 15d10ac1..6af21d11 100644
--- a/package.json
+++ b/package.json
@@ -1,65 +1,91 @@
 {
-	"name": "can-validate",
-	"version": "0.0.6",
-	"description": "Validation plugin for CanJS that provides an abstraction layer to your validation library of choice (Shim may be required).",
-	"scripts": {
-		"build": "node ./stealBuild.js",
-		"test": "testee --browsers firefox can-validate.test.html",
-		"prepublish": "npm run build",
-		"publish": "git push origin --tags",
-		"release:patch": "npm version patch && npm publish",
-		"release:minor": "npm version minor && npm publish",
-		"release:major": "npm version major && npm publish",
-		"document": "documentjs"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/canjs/can-validate.git"
-	},
-	"keywords": [
-		"Validate",
-		"plugin",
-		"canjs"
-	],
-	"author": {
-		"name": "Bitovi"
-	},
-	"license": "MIT",
-	"bugs": {
-		"url": "https://github.com/canjs/can-validate/issues"
-	},
-	"homepage": "https://github.com/canjs/can-validate",
-	"devDependencies": {
-		"documentjs": "^0.3.0-pre.5",
-		"jquery": "^2.1.4",
-		"steal": "^0.10.5",
-		"steal-qunit": "0.0.4",
-		"validate.js": "^0.8.0",
-		"steal-tools": "^0.11.0-pre.1",
-		"testee": "^0.2.0",
-		"can": "^2.3.0-pre.2"
-	},
-	"browser": {
-		"./can-validate": "./dist/cjs/can-validate/can-validate",
-		"./map/validate": "./dist/cjs/can-validate/map/validate/validate",
-		"./validations": "./dist/cjs/can-validate/validations",
-		"./shims/validatejs.shim": "./dist/cjs/can-validate/shims/validatejs.shim",
-		"./shims/validations.shim": "./dist/cjs/can-validate/shims/validations.shim"
-	},
-	"system": {
-		"ignoreBrowser": true,
-		"npmIgnore": [
-			"documentjs"
-		],
-		"npmDependencies": [
-			"steal-qunit"
-		],
-		"directories": {
-			"lib": "can-validate"
-		},
-		"paths": {
-			"validate.js": "./node_modules/validate.js/validate.js"
-		},
-		"transpiler": "babel"
-	}
+  "name": "can-validate",
+  "version": "0.4.1",
+  "description": "Validation plugin for CanJS that provides an abstraction layer to your validation library of choice (Shim may be required).",
+  "scripts": {
+    "build": "node ./stealBuild.js",
+    "serve": "http-server -p 3000 -c-1 -o",
+	"lint": "xo",
+    "test": "xo && testee --browsers firefox can-validate.test.html",
+    "prepublish": "npm run build",
+    "publish": "git push origin --tags",
+    "release:patch": "npm version patch && npm publish",
+    "release:minor": "npm version minor && npm publish",
+    "release:major": "npm version major && npm publish",
+    "document": "documentjs"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/canjs/can-validate.git"
+  },
+  "keywords": [
+    "Validate",
+    "plugin",
+    "canjs"
+  ],
+  "author": {
+    "name": "Bitovi"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/canjs/can-validate/issues"
+  },
+  "homepage": "https://github.com/canjs/can-validate",
+  "devDependencies": {
+    "can": "^2.3.0-pre.2",
+    "documentjs": "^0.3.0-pre.5",
+    "jquery": "^2.1.4",
+    "steal": "^0.10.5",
+    "steal-qunit": "0.0.4",
+    "steal-tools": "^0.11.0-pre.1",
+    "testee": "^0.2.0",
+    "validate.js": "^0.8.0",
+    "xo": "^0.9.0"
+  },
+  "browser": {
+    "./can-validate": "./dist/cjs/can-validate/can-validate",
+    "./map/validate": "./dist/cjs/can-validate/map/validate/validate",
+    "./validations": "./dist/cjs/can-validate/validations",
+    "./shims/validatejs.shim": "./dist/cjs/can-validate/shims/validatejs.shim",
+    "./shims/validations.shim": "./dist/cjs/can-validate/shims/validations.shim"
+  },
+  "system": {
+    "ignoreBrowser": true,
+    "npmIgnore": [
+      "documentjs",
+      "steal-qunit",
+      "testee",
+      "steal-tools",
+      "xo"
+    ],
+    "npmDependencies": [
+      "steal-qunit"
+    ],
+    "directories": {
+      "lib": "can-validate"
+    },
+    "paths": {
+      "validate.js": "./node_modules/validate.js/validate.js"
+    },
+    "transpiler": "babel"
+  },
+  "xo": {
+    "envs": [
+      "node",
+      "qunit"
+    ],
+    "rules": {
+      "no-lonely-if": 0,
+      "no-else-return": 0,
+      "spaced-comment": 0
+    },
+    "globals": [
+        "steal"
+    ],
+    "ignore": [
+      "node_modules/**",
+      "dist/**",
+      "docs/**"
+    ]
+  }
 }
diff --git a/stealBuild.js b/stealBuild.js
index 8f39d07c..97440370 100644
--- a/stealBuild.js
+++ b/stealBuild.js
@@ -1,16 +1,16 @@
-var stealTools = require("steal-tools");
+var stealTools = require('steal-tools');
 
 stealTools.export({
 	system: {
-		config: "package.json!npm",
-		main: "can-validate.build"
+		config: 'package.json!npm',
+		main: 'can-validate.build'
 	},
 	options: {
 		sourceMaps: true
 	},
 	outputs: {
-		"+cjs": {},
-		"+amd": {},
-		"+global-js": {}
+		'+cjs': {},
+		'+amd': {},
+		'+global-js': {}
 	}
 });