Almost there, fix JSON.
it's dirty, but it works...
Fix JS
Merge branch 'authentication'