Pushing for Alex to have js file structure w/minimal merge conflicts