Groundworks for heavy refactoring