Player is working, need to add it into a state tho
Merge branch 'PlayerBranch'