After initial testing but before refactoring