Added more structure, winner check is different. Have ot think of a way to implement it.