Commit 2 with video, editor, annotator, block basic