Refactoring in progress. Nothing even compiles.