Heavily refactored SovndClient