Changed some functions to be independant of whos playing, added curent player to state