Rework of some youtube stuff

Mark Harding requested to merge refactor/yt-rework into master May 06, 2020