Marking the items I'm working on with // TODO: [TiVo]: for EricB's identification