Adding files, moving to a js file
Fixed merge