partially resolved, still needs work