Adding js to pull from ajax
Fixing merge conflicts