Major Refactor; FInished User Story Player 2 Move.