wip - refactoring