More refactoring, add youtube