Ongoing refactoring progress…. (not ready)