Forgot what I did here, not stable doe
Trying to reconcile diffs, not sure if this will work