Not everything needs to run immediately.
I should have started with this fix instead of everything else ...