Note: I removed all of this because none of it was used.  We should add back as we track more things.