Moving fully over to SBT