Try to make some nice json objects
Adopt datahandling
Merge Markus' adoptions
Fix jshint errors