Continuation of great refactoring. Nothing works.