Moved hashtable to a separate method. Added player switch / Linus & Paul