#680 - begin resolution feature