First partial sweep at decoupling from XBMC