Resolve implementation mostly done