Add a second player. Remove some old code