Refactoring and beginning video transfer.