Changing win conditions

Broke apart win condition to be separate things