Changed state values from individual variables to properties on an object.  More Javascripty.