got tests to run in browser and console (with require.js), undid a lot of the previous changes in Form.js, less shimming. We now have a base to start from when refactoring.