Adding ability to cross-reference
Updating all the things