Revisiting this after the great migration.

Dead links removed etc etc