Refactor Reference Tracking+discussion

this is largely done, right?

the references *are* in the content, so it does make sense to me that either the reference object needs to make extensive use of the content object or vice versa.  But probably the former is generally best.