Moving JSON.parse to where we actually have a value