Modify the links so we can re-use some code

Signed-off-by: Suki <suki@missallsunday.com>
and that should do it
but we all know thats not true..

Signed-off-by: Suki <suki@missallsunday.com>