adds multi/exec, splits servicer out