Changed some things for player because of the addition of World and Location. There are todos in the files thant need doing (Funny that :P)