refactor(comp): wip