WIP ActivityTracker replacement.