Large changes to Helm, still, everything working