Refactor to count rounds

*Count rounds
*Display current round