Reworked the way video clips are chosen into a state machine and queue suitable for video streaming