Continued refactoring feature destruction, started implementing burning features