diff --git a/app/controllers/ClientController.php b/app/controllers/ClientController.php
index 57dd8a359026..8b5083d7115b 100755
--- a/app/controllers/ClientController.php
+++ b/app/controllers/ClientController.php
@@ -62,42 +62,7 @@ class ClientController extends \BaseController {
 	 */
 	public function store()
 	{
-		$rules = array(
-			'name' => 'required',
-			'email' => 'email'
-		);
-		$validator = Validator::make(Input::all(), $rules);
-
-		if ($validator->fails()) {
-			return Redirect::to('clients/create')
-				->withErrors($validator)
-				->withInput(Input::except('password'));
-		} else {			
-			$client = new Client;
-			$client->account_id = Auth::user()->account_id;
-			$client->name = Input::get('name');
-			$client->work_phone = Input::get('work_phone');
-			$client->address1 = Input::get('address1');
-			$client->address2 = Input::get('address2');
-			$client->city = Input::get('city');
-			$client->state = Input::get('state');
-			$client->notes = Input::get('notes');
-			$client->postal_code = Input::get('postal_code');
-			$client->save();
-
-			$contact = new Contact;
-			$contact->email = Input::get('email');
-			$contact->first_name = Input::get('first_name');
-			$contact->last_name = Input::get('last_name');
-			$contact->phone = Input::get('phone');
-			$client->contacts()->save($contact);
-
-			$url = 'clients/' . $client->id;
-			processedRequest($url);
-
-			Session::flash('message', 'Successfully created client');
-			return Redirect::to($url);
-		}
+		return $this->save();
 	}
 
 	/**
@@ -120,7 +85,7 @@ class ClientController extends \BaseController {
 	 */
 	public function edit($id)
 	{
-		$client = Client::find($id);
+		$client = Client::with('contacts')->find($id);
 		$data = array('client' => $client, 'method' => 'PUT', 'url' => 'clients/' . $id, 'title' => 'Edit');
 		return View::make('clients.edit', $data);
 	}
@@ -132,6 +97,11 @@ class ClientController extends \BaseController {
 	 * @return Response
 	 */
 	public function update($id)
+	{
+		return $this->save($id);
+	}
+
+	private function save($id = null)
 	{
 		$rules = array(
 			'name'       => 'required'
@@ -143,7 +113,12 @@ class ClientController extends \BaseController {
 				->withErrors($validator)
 				->withInput(Input::except('password'));
 		} else {			
-			$client = Client::find($id);
+			if ($id) {
+				$client = Client::find($id);
+			} else {
+				$client = new Client;
+			}
+
 			$client->name = Input::get('name');
 			$client->work_phone = Input::get('work_phone');
 			$client->address1 = Input::get('address1');
@@ -154,12 +129,36 @@ class ClientController extends \BaseController {
 			$client->postal_code = Input::get('postal_code');
 			$client->save();
 
-			$contact = $client->contacts[0];
-			$contact->email = Input::get('email');
-			$contact->first_name = Input::get('first_name');
-			$contact->last_name = Input::get('last_name');
-			$contact->phone = Input::get('phone');
-			$contact->save();
+			$data = json_decode(Input::get('data'));
+			$contactIds = [];
+
+			foreach ($data->contacts as $contact)
+			{
+				if (isset($contact->id) && $contact->id)
+				{
+					$record = Contact::find($contact->id);
+				}
+				else
+				{
+					$record = new Contact;
+				}
+
+				$record->email = $contact->email;
+				$record->first_name = $contact->first_name;
+				$record->last_name = $contact->last_name;
+				$record->phone = $contact->phone;
+
+				$client->contacts()->save($record);
+				$contactIds[] = $record->id;					
+			}
+
+			foreach ($client->contacts as $contact)
+			{
+				if (!in_array($contact->id, $contactIds))
+				{	
+					$contact->forceDelete();
+				}
+			}
 			
 			Session::flash('message', 'Successfully updated client');
 			return Redirect::to('clients');
diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php
index e8cfd505a567..f0edded2ee80 100755
--- a/app/controllers/InvoiceController.php
+++ b/app/controllers/InvoiceController.php
@@ -172,11 +172,23 @@ class InvoiceController extends \BaseController {
 		}
 	}
 
-	/**
-	 * Show the form for creating a new resource.
-	 *
-	 * @return Response
-	 */
+
+	public function edit($id)
+	{
+		$invoice = Invoice::with('client', 'invoice_items')->find($id);
+
+		$data = array(
+				'invoice' => $invoice, 
+				'method' => 'PUT', 
+				'url' => 'invoices/' . $id, 
+				'title' => 'Edit',
+				'account' => Auth::user()->account,
+				'products' => Product::getProducts()->get(),
+				'client' => $invoice->client,
+				'clients' => Client::where('account_id','=',Auth::user()->account_id)->orderBy('name')->get());
+		return View::make('invoices.edit', $data);
+	}
+
 	public function create($clientId = 0)
 	{		
 		$client = null;
@@ -193,7 +205,7 @@ class InvoiceController extends \BaseController {
 				'items' => json_decode(Input::old('items')),
 				'account' => Auth::user()->account,
 				'products' => Product::getProducts()->get(),
-				'clients' => Client::where('account_id','=',Auth::user()->account_id)->get());
+				'clients' => Client::where('account_id','=',Auth::user()->account_id)->orderBy('name')->get());
 		return View::make('invoices.edit', $data);
 	}
 
@@ -335,28 +347,6 @@ class InvoiceController extends \BaseController {
 		return View::make('invoices.show')->with('invoice', $invoice);
 	}
 
-	/**
-	 * Show the form for editing the specified resource.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function edit($id)
-	{
-		$invoice = Invoice::with('client', 'invoice_items')->find($id);
-
-		$data = array(
-				'invoice' => $invoice, 
-				'method' => 'PUT', 
-				'url' => 'invoices/' . $id, 
-				'title' => 'Edit',
-				'account' => Auth::user()->account,
-				'products' => Product::getProducts()->get(),
-				'client' => $invoice->client,
-				'clients' => Client::where('account_id','=',Auth::user()->account_id)->get());
-		return View::make('invoices.edit', $data);
-	}
-
 	/**
 	 * Update the specified resource in storage.
 	 *
diff --git a/app/views/clients/edit.blade.php b/app/views/clients/edit.blade.php
index a02daaeab031..5a98d5f86e28 100755
--- a/app/views/clients/edit.blade.php
+++ b/app/views/clients/edit.blade.php
@@ -10,15 +10,15 @@
 
 	<!--<h3>{{ $title }} Client</h3>-->
 	
-	@if ($client)
-		{{ Former::populate($client); }}
-	@endif
-
 	{{ Former::open($url)->addClass('col-md-9 col-md-offset-1 main_form')->method($method)->rules(array(
   		'name' => 'required',
   		'email' => 'email'  		
 	)); }}
 
+	@if ($client)
+		{{ Former::populate($client) }}
+	@endif
+
 	
 	{{ Former::legend('Organization') }}
 	{{ Former::text('name') }}
@@ -26,19 +26,72 @@
 	{{ Former::textarea('notes') }}
 
 	{{ Former::legend('Contacts') }}
-	{{ Former::text('first_name') }}
-	{{ Former::text('last_name') }}
-	{{ Former::text('email') }}
-	{{ Former::text('phone') }}	
+	<div data-bind="foreach: contacts">
+		{{ Former::hidden('id')->data_bind("value: id, valueUpdate: 'afterkeydown'") }}
+		{{ Former::text('first_name')->data_bind("value: first_name, valueUpdate: 'afterkeydown'") }}
+		{{ Former::text('last_name')->data_bind("value: last_name, valueUpdate: 'afterkeydown'") }}
+		{{ Former::text('email')->data_bind("value: email, valueUpdate: 'afterkeydown'") }}
+		{{ Former::text('phone')->data_bind("value: phone, valueUpdate: 'afterkeydown'") }}	
 
+		<div class="form-group">
+			<div class="col-lg-8 col-lg-offset-4">
+				<span data-bind="visible: $index() === ($parent.contacts().length - 1)">
+					{{ link_to('#', 'Add contact', array('onclick'=>'return addContact()')) }}
+				</span>
+				<span data-bind="visible: $parent.contacts().length > 1" class="pull-right">
+					{{ link_to('#', 'Remove contact', array('data-bind'=>'click: $parent.removeContact')) }}
+				</span>					
+			</div>
+		</div>
+		<div class="clearfix"></div>
+
+	</div>
+	
 	{{ Former::legend('Address') }}
-	{{ Former::text('address1')->label('Street') }}
-	{{ Former::text('address2')->label('Apt/Floor') }}
+	{{ Former::text('address1') }}
+	{{ Former::text('address2') }}
 	{{ Former::text('city') }}
 	{{ Former::text('state') }}
 	{{ Former::text('postal_code') }}
 
+	{{ Former::hidden('data')->data_bind("value: ko.toJSON(model)") }}	
+
 	{{ Former::actions( Button::lg_primary_submit('Save') ) }}
 	{{ Former::close() }}
 
+	<script type="text/javascript">
+
+	function ContactModel() {
+		var self = this;
+		self.id = ko.observable('');
+		self.first_name = ko.observable('');
+		self.last_name = ko.observable('');
+		self.email = ko.observable('');
+		self.phone = ko.observable('');
+	}
+
+	function ContactsModel() {
+		var self = this;
+		self.contacts = ko.observableArray();
+	}
+
+	@if ($client)
+		window.model = ko.mapping.fromJS({{ $client }});			
+	@else
+		window.model = new ContactsModel();
+		addContact();
+	@endif
+	ko.applyBindings(model);
+
+	function addContact() {
+		model.contacts.push(new ContactModel());
+		return false;
+	}
+
+	model.removeContact = function() {
+		model.contacts.remove(this);
+	}
+	
+	</script>
+
 @stop
\ No newline at end of file
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index ab77cec6fbeb..6c9bb45b1345 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -38,6 +38,7 @@
     <script type="text/javascript" src="{{ asset('js/jquery.dataTables.js') }}"></script>
     <script type="text/javascript" src="{{ asset('js/jquery.dataTables.js') }}"></script>
     <script type="text/javascript" src="{{ asset('js/knockout-3.0.0.js') }}"></script>
+    <script type="text/javascript" src="{{ asset('js/knockout.mapping-latest.js') }}"></script>
     <script src="{{ asset('js/knockout-sortable.js') }}" type="text/javascript"></script>		
 	<link rel="stylesheet" type="text/css" href="{{ asset('css/font-awesome.css') }}"/>
 	
diff --git a/public/js/knockout.mapping-latest.js b/public/js/knockout.mapping-latest.js
new file mode 100755
index 000000000000..8d1d51260c9e
--- /dev/null
+++ b/public/js/knockout.mapping-latest.js
@@ -0,0 +1,22 @@
+/// Knockout Mapping plugin v2.4.1
+/// (c) 2013 Steven Sanderson, Roy Jacobs - http://knockoutjs.com/
+/// License: MIT (http://www.opensource.org/licenses/mit-license.php)
+(function(e){"function"===typeof require&&"object"===typeof exports&&"object"===typeof module?e(require("knockout"),exports):"function"===typeof define&&define.amd?define(["knockout","exports"],e):e(ko,ko.mapping={})})(function(e,f){function y(b,c){var a,d;for(d in c)if(c.hasOwnProperty(d)&&c[d])if(a=f.getType(b[d]),d&&b[d]&&"array"!==a&&"string"!==a)y(b[d],c[d]);else if("array"===f.getType(b[d])&&"array"===f.getType(c[d])){a=b;for(var e=d,l=b[d],n=c[d],t={},g=l.length-1;0<=g;--g)t[l[g]]=l[g];for(g=
+n.length-1;0<=g;--g)t[n[g]]=n[g];l=[];n=void 0;for(n in t)l.push(t[n]);a[e]=l}else b[d]=c[d]}function E(b,c){var a={};y(a,b);y(a,c);return a}function z(b,c){for(var a=E({},b),e=L.length-1;0<=e;e--){var f=L[e];a[f]&&(a[""]instanceof Object||(a[""]={}),a[""][f]=a[f],delete a[f])}c&&(a.ignore=h(c.ignore,a.ignore),a.include=h(c.include,a.include),a.copy=h(c.copy,a.copy),a.observe=h(c.observe,a.observe));a.ignore=h(a.ignore,j.ignore);a.include=h(a.include,j.include);a.copy=h(a.copy,j.copy);a.observe=h(a.observe,
+j.observe);a.mappedProperties=a.mappedProperties||{};a.copiedProperties=a.copiedProperties||{};return a}function h(b,c){"array"!==f.getType(b)&&(b="undefined"===f.getType(b)?[]:[b]);"array"!==f.getType(c)&&(c="undefined"===f.getType(c)?[]:[c]);return e.utils.arrayGetDistinctValues(b.concat(c))}function F(b,c,a,d,k,l,n){var t="array"===f.getType(e.utils.unwrapObservable(c));l=l||"";if(f.isMapped(b)){var g=e.utils.unwrapObservable(b)[p];a=E(g,a)}var j=n||k,h=function(){return a[d]&&a[d].create instanceof
+Function},x=function(b){var f=G,g=e.dependentObservable;e.dependentObservable=function(a,b,c){c=c||{};a&&"object"==typeof a&&(c=a);var d=c.deferEvaluation,M=!1;c.deferEvaluation=!0;a=new H(a,b,c);if(!d){var g=a,d=e.dependentObservable;e.dependentObservable=H;a=e.isWriteableObservable(g);e.dependentObservable=d;d=H({read:function(){M||(e.utils.arrayRemoveItem(f,g),M=!0);return g.apply(g,arguments)},write:a&&function(a){return g(a)},deferEvaluation:!0});d.__DO=g;a=d;f.push(a)}return a};e.dependentObservable.fn=
+H.fn;e.computed=e.dependentObservable;b=e.utils.unwrapObservable(k)instanceof Array?a[d].create({data:b||c,parent:j,skip:N}):a[d].create({data:b||c,parent:j});e.dependentObservable=g;e.computed=e.dependentObservable;return b},u=function(){return a[d]&&a[d].update instanceof Function},v=function(b,f){var g={data:f||c,parent:j,target:e.utils.unwrapObservable(b)};e.isWriteableObservable(b)&&(g.observable=b);return a[d].update(g)};if(n=I.get(c))return n;d=d||"";if(t){var t=[],s=!1,m=function(a){return a};
+a[d]&&a[d].key&&(m=a[d].key,s=!0);e.isObservable(b)||(b=e.observableArray([]),b.mappedRemove=function(a){var c="function"==typeof a?a:function(b){return b===m(a)};return b.remove(function(a){return c(m(a))})},b.mappedRemoveAll=function(a){var c=C(a,m);return b.remove(function(a){return-1!=e.utils.arrayIndexOf(c,m(a))})},b.mappedDestroy=function(a){var c="function"==typeof a?a:function(b){return b===m(a)};return b.destroy(function(a){return c(m(a))})},b.mappedDestroyAll=function(a){var c=C(a,m);return b.destroy(function(a){return-1!=
+e.utils.arrayIndexOf(c,m(a))})},b.mappedIndexOf=function(a){var c=C(b(),m);a=m(a);return e.utils.arrayIndexOf(c,a)},b.mappedGet=function(a){return b()[b.mappedIndexOf(a)]},b.mappedCreate=function(a){if(-1!==b.mappedIndexOf(a))throw Error("There already is an object with the key that you specified.");var c=h()?x(a):a;u()&&(a=v(c,a),e.isWriteableObservable(c)?c(a):c=a);b.push(c);return c});n=C(e.utils.unwrapObservable(b),m).sort();g=C(c,m);s&&g.sort();s=e.utils.compareArrays(n,g);n={};var J,A=e.utils.unwrapObservable(c),
+y={},z=!0,g=0;for(J=A.length;g<J;g++){var r=m(A[g]);if(void 0===r||r instanceof Object){z=!1;break}y[r]=A[g]}var A=[],B=0,g=0;for(J=s.length;g<J;g++){var r=s[g],q,w=l+"["+g+"]";switch(r.status){case "added":var D=z?y[r.value]:K(e.utils.unwrapObservable(c),r.value,m);q=F(void 0,D,a,d,b,w,k);h()||(q=e.utils.unwrapObservable(q));w=O(e.utils.unwrapObservable(c),D,n);q===N?B++:A[w-B]=q;n[w]=!0;break;case "retained":D=z?y[r.value]:K(e.utils.unwrapObservable(c),r.value,m);q=K(b,r.value,m);F(q,D,a,d,b,w,
+k);w=O(e.utils.unwrapObservable(c),D,n);A[w]=q;n[w]=!0;break;case "deleted":q=K(b,r.value,m)}t.push({event:r.status,item:q})}b(A);a[d]&&a[d].arrayChanged&&e.utils.arrayForEach(t,function(b){a[d].arrayChanged(b.event,b.item)})}else if(P(c)){b=e.utils.unwrapObservable(b);if(!b){if(h())return s=x(),u()&&(s=v(s)),s;if(u())return v(s);b={}}u()&&(b=v(b));I.save(c,b);if(u())return b;Q(c,function(d){var f=l.length?l+"."+d:d;if(-1==e.utils.arrayIndexOf(a.ignore,f))if(-1!=e.utils.arrayIndexOf(a.copy,f))b[d]=
+c[d];else if("object"!=typeof c[d]&&"array"!=typeof c[d]&&0<a.observe.length&&-1==e.utils.arrayIndexOf(a.observe,f))b[d]=c[d],a.copiedProperties[f]=!0;else{var g=I.get(c[d]),k=F(b[d],c[d],a,d,b,f,b),g=g||k;if(0<a.observe.length&&-1==e.utils.arrayIndexOf(a.observe,f))b[d]=g(),a.copiedProperties[f]=!0;else{if(e.isWriteableObservable(b[d])){if(g=e.utils.unwrapObservable(g),b[d]()!==g)b[d](g)}else g=void 0===b[d]?g:e.utils.unwrapObservable(g),b[d]=g;a.mappedProperties[f]=!0}}})}else switch(f.getType(c)){case "function":u()?
+e.isWriteableObservable(c)?(c(v(c)),b=c):b=v(c):b=c;break;default:if(e.isWriteableObservable(b))return q=u()?v(b):e.utils.unwrapObservable(c),b(q),q;h()||u();b=h()?x():e.observable(e.utils.unwrapObservable(c));u()&&b(v(b))}return b}function O(b,c,a){for(var d=0,e=b.length;d<e;d++)if(!0!==a[d]&&b[d]===c)return d;return null}function R(b,c){var a;c&&(a=c(b));"undefined"===f.getType(a)&&(a=b);return e.utils.unwrapObservable(a)}function K(b,c,a){b=e.utils.unwrapObservable(b);for(var d=0,f=b.length;d<
+f;d++){var l=b[d];if(R(l,a)===c)return l}throw Error("When calling ko.update*, the key '"+c+"' was not found!");}function C(b,c){return e.utils.arrayMap(e.utils.unwrapObservable(b),function(a){return c?R(a,c):a})}function Q(b,c){if("array"===f.getType(b))for(var a=0;a<b.length;a++)c(a);else for(a in b)c(a)}function P(b){var c=f.getType(b);return("object"===c||"array"===c)&&null!==b}function T(){var b=[],c=[];this.save=function(a,d){var f=e.utils.arrayIndexOf(b,a);0<=f?c[f]=d:(b.push(a),c.push(d))};
+this.get=function(a){a=e.utils.arrayIndexOf(b,a);return 0<=a?c[a]:void 0}}function S(){var b={},c=function(a){var c;try{c=a}catch(e){c="$$$"}a=b[c];void 0===a&&(a=new T,b[c]=a);return a};this.save=function(a,b){c(a).save(a,b)};this.get=function(a){return c(a).get(a)}}var p="__ko_mapping__",H=e.dependentObservable,B=0,G,I,L=["create","update","key","arrayChanged"],N={},x={include:["_destroy"],ignore:[],copy:[],observe:[]},j=x;f.isMapped=function(b){return(b=e.utils.unwrapObservable(b))&&b[p]};f.fromJS=
+function(b){if(0==arguments.length)throw Error("When calling ko.fromJS, pass the object you want to convert.");try{B++||(G=[],I=new S);var c,a;2==arguments.length&&(arguments[1][p]?a=arguments[1]:c=arguments[1]);3==arguments.length&&(c=arguments[1],a=arguments[2]);a&&(c=E(c,a[p]));c=z(c);var d=F(a,b,c);a&&(d=a);if(!--B)for(;G.length;){var e=G.pop();e&&(e(),e.__DO.throttleEvaluation=e.throttleEvaluation)}d[p]=E(d[p],c);return d}catch(f){throw B=0,f;}};f.fromJSON=function(b){var c=e.utils.parseJson(b);
+arguments[0]=c;return f.fromJS.apply(this,arguments)};f.updateFromJS=function(){throw Error("ko.mapping.updateFromJS, use ko.mapping.fromJS instead. Please note that the order of parameters is different!");};f.updateFromJSON=function(){throw Error("ko.mapping.updateFromJSON, use ko.mapping.fromJSON instead. Please note that the order of parameters is different!");};f.toJS=function(b,c){j||f.resetDefaultOptions();if(0==arguments.length)throw Error("When calling ko.mapping.toJS, pass the object you want to convert.");
+if("array"!==f.getType(j.ignore))throw Error("ko.mapping.defaultOptions().ignore should be an array.");if("array"!==f.getType(j.include))throw Error("ko.mapping.defaultOptions().include should be an array.");if("array"!==f.getType(j.copy))throw Error("ko.mapping.defaultOptions().copy should be an array.");c=z(c,b[p]);return f.visitModel(b,function(a){return e.utils.unwrapObservable(a)},c)};f.toJSON=function(b,c){var a=f.toJS(b,c);return e.utils.stringifyJson(a)};f.defaultOptions=function(){if(0<arguments.length)j=
+arguments[0];else return j};f.resetDefaultOptions=function(){j={include:x.include.slice(0),ignore:x.ignore.slice(0),copy:x.copy.slice(0)}};f.getType=function(b){if(b&&"object"===typeof b){if(b.constructor===Date)return"date";if(b.constructor===Array)return"array"}return typeof b};f.visitModel=function(b,c,a){a=a||{};a.visitedObjects=a.visitedObjects||new S;var d,k=e.utils.unwrapObservable(b);if(P(k))a=z(a,k[p]),c(b,a.parentName),d="array"===f.getType(k)?[]:{};else return c(b,a.parentName);a.visitedObjects.save(b,
+d);var l=a.parentName;Q(k,function(b){if(!(a.ignore&&-1!=e.utils.arrayIndexOf(a.ignore,b))){var j=k[b],g=a,h=l||"";"array"===f.getType(k)?l&&(h+="["+b+"]"):(l&&(h+="."),h+=b);g.parentName=h;if(!(-1===e.utils.arrayIndexOf(a.copy,b)&&-1===e.utils.arrayIndexOf(a.include,b)&&k[p]&&k[p].mappedProperties&&!k[p].mappedProperties[b]&&k[p].copiedProperties&&!k[p].copiedProperties[b]&&"array"!==f.getType(k)))switch(f.getType(e.utils.unwrapObservable(j))){case "object":case "array":case "undefined":g=a.visitedObjects.get(j);
+d[b]="undefined"!==f.getType(g)?g:f.visitModel(j,c,a);break;default:d[b]=c(j,a.parentName)}}});return d}});