Attach and remove demand and nondemand inputs to and from validation in jquery.  Start testing validation for problems.