reorganize, and add vcr controls