Changes to the interface.  Worked out bugs and constraint errors.  Tested in 4 and 5