Begin to implement better video handling