Pre-refactor prep.