FIXED
backup
Passing it to main.js now :D
Merge branch