Player refactor and add data #58