Tidied up naming, ability to get winner (v1)