an intermediate stage of refactoring where everything is working again but everything is in overview
fixes issues after a major refactor