Add 'Watch & Listen' - Closes #4941