Changed JSON output to be more expandable and easier to itterate.