Hardcore refactoring. Nothing works