updated the links objects file and tweaked some other files so they used the base extends rather than duplicating code