-Changed JSONObject property holders to just return info from the object itself