ST3 Compatibility

The changes aren't compatible with ST2, so they're in a separate st3 branch.