Think I got most of it working for ST3. #190