Added Player

I also possibly broke a bunch of other things.