Data passing from controller made more flexible

The JSON that the controller generates now stores the array of marker data under the
hash markers, to allow other data to be stored at the root of the JSON as well.