Mid-way through adding support for track() to the core STM system