Intermediate commit. Mostly working on CableCARD tuner support.