Add ST3 support

This should now be backwards compatible with ST2 and ST3