Completed v2

Fixed the win condition to make it neater.