WIP. Fixed JSON issue.