Anton/video player grading

Do not Merge