refactor wip
testing