Initial commit of SBM redesign