Big fix
Change the Helper to just be a single helper that runs for all the different apps that need it.