Fixing DataFudger to actually work, ugly as hell