Player partially working, still needs improvements