make it work a little better (although still inherently bound to a tournament instance for now)