Bunch of new round tracking logic