Moved contact resolution to it's own class.