Resolve implementation done, not tested