Work-in-progress - updates to media sync protocol and file handling