Lots of work for link and design refactors