Added linkup traps.
Should be complete now.
Ready to test.