move SVCs and switched shunt out of shunt, continue lazy load dev