VID-1769 debugging race conditions with videos module load

Don't merge just yet, need to verify my implementation