Moving my tube-watching additions into a watch_only function
Better consistency/code structure