Added some new player functionality, but it is not finished.