Link integrity

closes #35