Oh crap! I think I accidentally glossed over that earlier! I was looking through Toshiba's site and I think I saw that but it just didn't register!

That certainly looks like I would get if I wanted to upgrade my Tivo at the same time. However, I don't see Tivo offering a way to edit out content from your recordings. Still, that is an attractive option, and I'd like a Series 2 Tivo at some point.