Massive refactoring and working but buggy challenge progression