move more logic into audio video player