Working on everything almost
Fixing the merge conflig with application.js