Fuckhueg update. This calls for a backup prior to merge in case something breaks.