First working version of control at frame level.
Cleanup.