Global testing, graphics refactoring...