wip
merge fix
atempt to use resolver
atempt to use resolver
atempt to use resolver
wip