Everything Functional No Vendor/Credit

Added headers back. Linking would not work well otherwise.