renamed the thing with gson and a bit more...