More merges
Work on file player