Groundwork before refactoring