enh: added wip refactor