finish switch to gson for json serialization