use query so we can add pagination later