make resolvers simpler but more powerful
add comment
remove todo