still with the refactoring, in progress