Always return JSON instead of a stringified JSON!
Update TODO's.