Final test, still refactoring...