Bottom links, and stuff.
fixed merge conflicts