Large rework to tracking features and some user utils for such