Adds initial basic resolving logic