Started fixing JSONObject problem