current status of a bigger refactoring