Forced refactoring... ...huge