Iterated on SBS stub, and test2 build