Video sprint32

Sprint work from the last two weeks. Each ticket has been code reviewed individually. Please don't merge just yet.