WIP sv list refactor

#2033

WIP of the SV list refactor.