moving things to use ApiResponse