Start of great refactoring. Nothing works.