Annotate Matrix Refs with type info

The exact method of how to do this is still actively being proposed so I deleted the previous content of the issue (can be viewed from edit history). I will refill this out once a decision is made but for now consider this a reminder that this chunk of work needs to be done to complete the feature