Finished Changes
Merge branch 'JavascriptModulation'
Fixed Main