add Resolve class (WIP)