Link integrity

closes #18