Assit
Bring in the JS
Silva's changes
Other changes.
Rearranging