Alright, I'll add the info to the frame state.  It won't be part of this pull request.