More testing and refactoring...