Export works again but Refactoring ain't over