Moving stuff around and making the linker smarter