some todo resolves