Revert "Ton of work, but everything relating to linking and data will be re-written"

This reverts commit 0d2c7777bbad5d4dd39f6d1759353e782325039e.