JSON looks cool now
merge conflicts