Minor updates.  In testing.  Currently not working.