Yes E-Trade do have both in their trading platform but I don't believe they have end of day data for all stocks that can be downloaded.