Ah yes. Those are two things we want to include in the next tracker update for sure