Changes to json and more maps

Sorry if this crashes!