Multiplexing video works -- need to merge chanes from master-pi into repository.