Returning JSON but this is still not structured properly