Begin refactor. New video scheme works\!