Lots of changes, some tournament code and whatnot