Initial JSON Updates

Initial JSON updates currently using XStream.