Going to redo some of the linking mechanics to ensure client/server sync