major edits - linking things...