refactor so requesting JSON/DATA makes more sense