Reworking the link thing...

Still not ok!